ChangeLogTag Fri Aug 19 07:56:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

626 files changed, 21715 insertions, 52405 deletions

diff --git a/TAO/tao/Alias_TypeCode.cpp b/TAO/tao/Alias_TypeCode.cpp
deleted file mode 100644
index 1968f944047..00000000000
--- a/TAO/tao/Alias_TypeCode.cpp
+++ /dev/null
@@ -1,201 +0,0 @@
-// $Id$
-
-#ifndef TAO_ALIAS_TYPECODE_CPP
-#define TAO_ALIAS_TYPECODE_CPP
-
-#include "tao/Alias_TypeCode.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/Alias_TypeCode.inl"
-#endif  /* !__ACE_INLINE__ */
-
-#include "tao/ORB_Core.h"
-#include "tao/CDR.h"
-#include "tao/TypeCode_Traits.h"
-
-#include "ace/Dynamic_Service.h"
-
-
-template <typename StringType,
-          typename TypeCodeType,
-          class RefCountPolicy>
-bool
-TAO::TypeCode::Alias<StringType,
-                     TypeCodeType,
-                     RefCountPolicy>::tao_marshal (TAO_OutputCDR & cdr,
-                                                   CORBA::ULong offset) const
-{
-  // A tk_alias TypeCode has a "complex" parameter list type (see
-  // Table 15-2 in Section 15.3.5.1 "TypeCode" in the CDR section of
-  // the CORBA specification), meaning that it must be marshaled into
-  // a CDR encapsulation.
-
-  // Create a CDR encapsulation.
-
-  TAO_OutputCDR enc;
-
-  // Account for the encoded CDR encapsulation length and byte order.
-  //
-  // Aligning on an octet since the next value after the CDR
-  // encapsulation length will always be the byte order octet/boolean
-  // in this case.
-  offset = ACE_align_binary (offset + 4,
-                             ACE_CDR::OCTET_ALIGN);
-
-  return
-    enc << TAO_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER)
-    && enc << TAO_OutputCDR::from_string (this->attributes_.id (), 0)
-    && enc << TAO_OutputCDR::from_string (this->attributes_.name (), 0)
-    && marshal (enc,
-                Traits<StringType>::get_typecode (this->content_type_),
-                offset + enc.total_length ())
-    && cdr << static_cast<CORBA::ULong> (enc.total_length ())
-    && cdr.write_octet_array_mb (enc.begin ());
-}
-
-template<typename StringType,
-         typename TypeCodeType,
-         class RefCountPolicy>
-void
-TAO::TypeCode::Alias<StringType,
-                     TypeCodeType,
-                     RefCountPolicy>::tao_duplicate (void)
-{
-  this->RefCountPolicy::add_ref ();
-}
-
-template<typename StringType,
-         typename TypeCodeType,
-         class RefCountPolicy>
-void
-TAO::TypeCode::Alias<StringType,
-                     TypeCodeType,
-                     RefCountPolicy>::tao_release (void)
-{
-  this->RefCountPolicy::remove_ref ();
-}
-
-template<typename StringType,
-         typename TypeCodeType,
-         class RefCountPolicy>
-CORBA::Boolean
-TAO::TypeCode::Alias<StringType,
-                     TypeCodeType,
-                     RefCountPolicy>::equal_i (CORBA::TypeCode_ptr tc
-                                               ACE_ENV_ARG_DECL) const
-{
-  // The CORBA::TypeCode base class already verified equality of the
-  // base attributes (id and name).  Perform an equality comparison of
-  // the content.
-
-  CORBA::TypeCode_var rhs_content_type =
-    tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return
-    Traits<StringType>::get_typecode (this->content_type_)->equal (
-      rhs_content_type.in ()
-      ACE_ENV_ARG_PARAMETER);
-}
-
-template<typename StringType,
-         typename TypeCodeType,
-         class RefCountPolicy>
-CORBA::Boolean
-TAO::TypeCode::Alias<StringType,
-                     TypeCodeType,
-                     RefCountPolicy>::equivalent_i (
-  CORBA::TypeCode_ptr
-  ACE_ENV_ARG_DECL_NOT_USED) const
-{
-  // Equivalence already verified in the base class
-  // CORBA::TypeCode::equivalent() method.
-
-  return true;
-}
-
-template<typename StringType,
-         typename TypeCodeType,
-         class RefCountPolicy>
-CORBA::TypeCode_ptr
-TAO::TypeCode::Alias<StringType,
-                     TypeCodeType,
-                     RefCountPolicy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
-{
-  TAO_TypeCodeFactory_Adapter * const adapter =
-    ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-        TAO_ORB_Core::typecodefactory_adapter_name ()
-      );
-
-  if (adapter == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INITIALIZE (),
-                        CORBA::TypeCode::_nil ());
-    }
-
-  CORBA::TypeCode_var compact_content_type =
-    Traits<StringType>::get_typecode (
-      this->content_type_)->get_compact_typecode (
-        ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-
-  if (this->kind_ == CORBA::tk_alias)
-    {
-      return adapter->create_alias_tc (this->attributes_.id (),
-                                       "",  /* empty name */
-                                       compact_content_type.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-    }
-  else
-    {
-      return adapter->create_value_box_tc (this->attributes_.id (),
-                                           "",  /* empty name */
-                                           compact_content_type.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-    }
-}
-
-template<typename StringType,
-         typename TypeCodeType,
-         class RefCountPolicy>
-char const *
-TAO::TypeCode::Alias<StringType,
-                     TypeCodeType,
-                     RefCountPolicy>::id_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->attributes_.id ();
-}
-
-template<typename StringType,
-         typename TypeCodeType,
-         class RefCountPolicy>
-char const *
-TAO::TypeCode::Alias<StringType,
-                     TypeCodeType,
-                     RefCountPolicy>::name_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->attributes_.name ();
-}
-
-template<typename StringType,
-         typename TypeCodeType,
-         class RefCountPolicy>
-CORBA::TypeCode_ptr
-TAO::TypeCode::Alias<StringType,
-                     TypeCodeType,
-                     RefCountPolicy>::content_type_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return
-     CORBA::TypeCode::_duplicate (
-       Traits<StringType>::get_typecode (this->content_type_));
-}
-
-#endif  /*  TAO_ALIAS_TYPECODE_CPP */
diff --git a/TAO/tao/Alias_TypeCode.h b/TAO/tao/Alias_TypeCode.h
deleted file mode 100644
index db2a74f3827..00000000000
--- a/TAO/tao/Alias_TypeCode.h
+++ /dev/null
@@ -1,141 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Alias_TypeCode.h
- *
- *  $Id$
- *
- *  Header file for a @c tk_alias and @c tk_value_box
- *  @c CORBA::TypeCode.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_ALIAS_TYPECODE_H
-#define TAO_ALIAS_TYPECODE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TypeCode.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TypeCodeFactory_Adapter.h"
-#include "tao/TypeCode_Base_Attributes.h"
-
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    /**
-     * @class Alias
-     *
-     * @brief @c CORBA::TypeCode implementation for an OMG IDL
-     *        @c typedef.
-     *
-     * This class implements a @c CORBA::TypeCode for an OMG IDL
-     * @c typedef.
-     */
-    template <typename StringType,
-              typename TypeCodeType,
-              class RefCountPolicy>
-    class Alias
-      : public CORBA::TypeCode,
-        private RefCountPolicy
-    {
-    public:
-
-      /// Constructor.
-      Alias (CORBA::TCKind kind,
-             char const * id,
-             char const * name,
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x572)
-             // Borland C++ currently can't handle a reference to
-             // const pointer to const CORBA::TypeCode_ptr
-             TypeCodeType tc);
-#else
-             TypeCodeType const & tc);
-#endif
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
-      //@}
-
-    protected:
-
-      /**
-       * @name @c TAO CORBA::TypeCode Template Methods
-       *
-       * @c tk_alias and @c tk_value_box @c CORBA::TypeCode -specific
-       * template methods.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr content_type_i (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    private:
-
-      /// Base attributes for this @c TypeCode containing the
-      /// repository ID and name of the @c typedef.
-      Base_Attributes<StringType> attributes_;
-
-      /// The @c TypeCode corresponding to the original type upon
-      /// which the IDL @c typedef was made.
-      /**
-       * A pointer to the @c CORBA::TypeCode_ptr rather than the
-       * @c CORBA::TypeCode_ptr itself is stored since that address is
-       * well-defined.  We may not know the value of the @c
-       * CORBA::TypeCode_ptr when creating this @c Field statically at
-       * compile-time, hence the indirection.
-       *
-       * @note This @c TypeCode is released upon destruction of this
-       *       @c TypeCode::Alias.
-       */
-      TypeCodeType const content_type_;
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/Alias_TypeCode.inl"
-#endif  /* __ACE_INLINE__ */
-
-#ifdef ACE_TEMPLATES_REQUIRE_SOURCE
-# include "tao/Alias_TypeCode.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
-# pragma implementation ("Alias_TypeCode.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ALIAS_TYPECODE_H */
diff --git a/TAO/tao/Alias_TypeCode.inl b/TAO/tao/Alias_TypeCode.inl
deleted file mode 100644
index fb692130538..00000000000
--- a/TAO/tao/Alias_TypeCode.inl
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-
-template<typename StringType,
-         typename TypeCodeType,
-         class RefCountPolicy>
-ACE_INLINE
-TAO::TypeCode::Alias<StringType,
-                     TypeCodeType,
-                     RefCountPolicy>::Alias (
-  CORBA::TCKind kind,
-  char const * id,
-  char const * name,
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x572)
-  // Borland C++ currently can't handle a reference to
-  // const pointer to const CORBA::TypeCode_ptr
-  TypeCodeType tc)
-#else
-  TypeCodeType const & tc)
-#endif
-  : CORBA::TypeCode (kind)
-  , RefCountPolicy ()
-  , attributes_ (id, name)
-  , content_type_ (tc)
-{
-}
diff --git a/TAO/tao/Alias_TypeCode_Static.cpp b/TAO/tao/Alias_TypeCode_Static.cpp
deleted file mode 100644
index 1c6e43bbe5f..00000000000
--- a/TAO/tao/Alias_TypeCode_Static.cpp
+++ /dev/null
@@ -1,174 +0,0 @@
-// $Id$
-
-#include "tao/Alias_TypeCode_Static.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/Alias_TypeCode_Static.inl"
-#endif  /* !__ACE_INLINE__ */
-
-#include "tao/ORB_Core.h"
-#include "tao/CDR.h"
-#include "tao/TypeCode_Traits.h"
-#include "tao/TypeCodeFactory_Adapter.h"
-
-#include "ace/Dynamic_Service.h"
-
-
-ACE_RCSID (tao,
-           Alias_TypeCode_Static,
-           "$Id$")
-
-
-bool
-TAO::TypeCode::Alias<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::Null_RefCount_Policy>::tao_marshal (
-  TAO_OutputCDR & cdr,
-  CORBA::ULong offset) const
-{
-  // A tk_alias TypeCode has a "complex" parameter list type (see
-  // Table 15-2 in Section 15.3.5.1 "TypeCode" in the CDR section of
-  // the CORBA specification), meaning that it must be marshaled into
-  // a CDR encapsulation.
-
-  // Create a CDR encapsulation.
-
-  TAO_OutputCDR enc;
-
-  // Account for the encoded CDR encapsulation length and byte order.
-  //
-  // Aligning on an octet since the next value after the CDR
-  // encapsulation length will always be the byte order octet/boolean
-  // in this case.
-  offset = ACE_align_binary (offset + 4,
-                             ACE_CDR::OCTET_ALIGN);
-
-  return
-    enc << TAO_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER)
-    && enc << TAO_OutputCDR::from_string (this->attributes_.id (), 0)
-    && enc << TAO_OutputCDR::from_string (this->attributes_.name (), 0)
-    && marshal (enc,
-                Traits<char const *>::get_typecode (this->content_type_),
-                offset + enc.total_length ())
-    && cdr << static_cast<CORBA::ULong> (enc.total_length ())
-    && cdr.write_octet_array_mb (enc.begin ());
-}
-
-void
-TAO::TypeCode::Alias<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::Null_RefCount_Policy>::tao_duplicate (void)
-{
-}
-
-void
-TAO::TypeCode::Alias<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::Null_RefCount_Policy>::tao_release (void)
-{
-}
-
-CORBA::Boolean
-TAO::TypeCode::Alias<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::Null_RefCount_Policy>::equal_i (CORBA::TypeCode_ptr tc
-                                               ACE_ENV_ARG_DECL) const
-{
-  // The CORBA::TypeCode base class already verified equality of the
-  // base attributes (id and name).  Perform an equality comparison of
-  // the content.
-
-  CORBA::TypeCode_var rhs_content_type =
-    tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return
-    Traits<char const *>::get_typecode (this->content_type_)->equal (
-      rhs_content_type.in ()
-      ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Boolean
-TAO::TypeCode::Alias<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::Null_RefCount_Policy>::equivalent_i (
-  CORBA::TypeCode_ptr
-  ACE_ENV_ARG_DECL_NOT_USED) const
-{
-  // Equivalence already verified in the base class
-  // CORBA::TypeCode::equivalent() method.
-
-  return true;
-}
-
-CORBA::TypeCode_ptr
-TAO::TypeCode::Alias<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::Null_RefCount_Policy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
-{
-  TAO_TypeCodeFactory_Adapter * const adapter =
-    ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-        TAO_ORB_Core::typecodefactory_adapter_name ()
-      );
-
-  if (adapter == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INITIALIZE (),
-                        CORBA::TypeCode::_nil ());
-    }
-
-  CORBA::TypeCode_var compact_content_type =
-    Traits<char const *>::get_typecode (
-      this->content_type_)->get_compact_typecode (
-        ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-
-  if (this->kind_ == CORBA::tk_alias)
-    {
-      return adapter->create_alias_tc (this->attributes_.id (),
-                                       "",  /* empty name */
-                                       compact_content_type.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-    }
-  else
-    {
-      return adapter->create_value_box_tc (this->attributes_.id (),
-                                           "",  /* empty name */
-                                           compact_content_type.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-    }
-}
-
-char const *
-TAO::TypeCode::Alias<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::Null_RefCount_Policy>::id_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->attributes_.id ();
-}
-
-char const *
-TAO::TypeCode::Alias<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::Null_RefCount_Policy>::name_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->attributes_.name ();
-}
-
-CORBA::TypeCode_ptr
-TAO::TypeCode::Alias<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::Null_RefCount_Policy>::content_type_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return
-     CORBA::TypeCode::_duplicate (
-       Traits<char const *>::get_typecode (this->content_type_));
-}
diff --git a/TAO/tao/Alias_TypeCode_Static.h b/TAO/tao/Alias_TypeCode_Static.h
deleted file mode 100644
index 8f933096297..00000000000
--- a/TAO/tao/Alias_TypeCode_Static.h
+++ /dev/null
@@ -1,131 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Alias_TypeCode_Static.h
- *
- *  $Id$
- *
- *  Header file for a static @c tk_alias and @c tk_value_box
- *  @c CORBA::TypeCode.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_ALIAS_TYPECODE_STATIC_H
-#define TAO_ALIAS_TYPECODE_STATIC_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TypeCode.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TypeCode_Base_Attributes.h"
-#include "tao/Null_RefCount_Policy.h"
-
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    template <typename StringType,
-              typename TypeCodeType,
-              class RefCountPolicy> class Alias;
-
-    /**
-     * @class Alias
-     *
-     * @brief @c CORBA::TypeCode implementation for an OMG IDL
-     *        @c typedef.
-     *
-     * This class implements a @c CORBA::TypeCode for an OMG IDL
-     * @c typedef.
-     */
-    template<>
-    class TAO_Export Alias<char const *,
-                           CORBA::TypeCode_ptr const *,
-                           TAO::Null_RefCount_Policy>
-      : public CORBA::TypeCode,
-        private TAO::Null_RefCount_Policy
-    {
-    public:
-
-      /// Constructor.
-      Alias (CORBA::TCKind kind,
-             char const * id,
-             char const * name,
-             CORBA::TypeCode_ptr const * tc);
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
-      //@}
-
-    protected:
-
-      /**
-       * @name @c TAO CORBA::TypeCode Template Methods
-       *
-       * @c tk_alias and @c tk_value_box @c CORBA::TypeCode -specific
-       * template methods.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr content_type_i (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    private:
-
-      /// Base attributes for this @c TypeCode containing the
-      /// repository ID and name of the @c typedef.
-      Base_Attributes<char const *> attributes_;
-
-      /// The @c TypeCode corresponding to the original type upon
-      /// which the IDL @c typedef was made.
-      /**
-       * A pointer to the @c CORBA::TypeCode_ptr rather than the
-       * @c CORBA::TypeCode_ptr itself is stored since that address is
-       * well-defined.  We may not know the value of the @c
-       * CORBA::TypeCode_ptr when creating this @c Field statically at
-       * compile-time, hence the indirection.
-       *
-       * @note This @c TypeCode is released upon destruction of this
-       *       @c TypeCode::Alias.
-       */
-      CORBA::TypeCode_ptr const * content_type_;
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/Alias_TypeCode_Static.inl"
-#endif  /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ALIAS_TYPECODE_STATIC_H */
diff --git a/TAO/tao/Alias_TypeCode_Static.inl b/TAO/tao/Alias_TypeCode_Static.inl
deleted file mode 100644
index a2665f5e461..00000000000
--- a/TAO/tao/Alias_TypeCode_Static.inl
+++ /dev/null
@@ -1,18 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-ACE_INLINE
-TAO::TypeCode::Alias<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::Null_RefCount_Policy>::Alias (
-  CORBA::TCKind kind,
-  char const * id,
-  char const * name,
-  CORBA::TypeCode_ptr const * tc)
-  : CORBA::TypeCode (kind)
-  , ACE_NESTED_CLASS (TAO, Null_RefCount_Policy) ()
-  , attributes_ (id, name)
-  , content_type_ (tc)
-{
-}
diff --git a/TAO/tao/Any.cpp b/TAO/tao/Any.cpp
deleted file mode 100644
index f2b95db1eb7..00000000000
--- a/TAO/tao/Any.cpp
+++ /dev/null
@@ -1,887 +0,0 @@
-// $Id$
-
-#include "tao/Any.h"
-#include "tao/Any_Basic_Impl.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Special_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
-#include "tao/Any_Unknown_IDL_Type.h"
-#include "tao/Object.h"
-#include "tao/TypeCode.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/SystemException.h"
-#include "tao/CDR.h"
-
-#include "ace/Log_Msg.h"
-#include "ace/OS_NS_string.h"
-#include "ace/OS_NS_wchar.h"
-#include "ace/OS_Memory.h"
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) \
-    || defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#include "Var_Size_Argument_T.h"
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Any.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           Any,
-           "$Id$")
-
-using namespace TAO;
-
-CORBA::Any::Any (void)
-  : impl_ (0)
-{
-}
-
-CORBA::Any::Any (const CORBA::Any &rhs)
-  : impl_ (rhs.impl_)
-{
-  if (this->impl_ != 0)
-    {
-      this->impl_->_add_ref ();
-    }
-}
-
-CORBA::Any::~Any (void)
-{
-  if (this->impl_ != 0)
-    {
-      this->impl_->_remove_ref ();
-    }
-}
-
-CORBA::Any &
-CORBA::Any::operator= (const CORBA::Any &rhs)
-{
-  if (this->impl_ != rhs.impl_)
-    {
-      if (this->impl_ != 0)
-        {
-          this->impl_->_remove_ref ();
-        }
-
-      this->impl_ = rhs.impl_;
-
-      if (this->impl_ != 0)
-        {
-          this->impl_->_add_ref ();
-        }
-    }
-
-  return *this;
-}
-
-void
-CORBA::Any::replace (TAO::Any_Impl *new_impl)
-{
-  ACE_ASSERT (new_impl != 0);
-
-  if (this->impl_ != 0)
-    {
-      this->impl_->_remove_ref ();
-    }
-
-  this->impl_ = new_impl;
-}
-
-CORBA::TypeCode_ptr
-CORBA::Any::type (void) const
-{
-  if (this->impl_ != 0)
-    {
-      return this->impl_->type ();
-    }
-
-  return CORBA::TypeCode::_duplicate (CORBA::_tc_null);
-}
-
-CORBA::TypeCode_ptr
-CORBA::Any::_tao_get_typecode (void) const
-{
-  if (this->impl_ != 0)
-    {
-      return this->impl_->_tao_get_typecode ();
-    }
-
-  return CORBA::_tc_null;
-}
-
-void
-CORBA::Any::_tao_set_typecode (const CORBA::TypeCode_ptr tc)
-{
-  if (this->impl_ == 0)
-    {
-      ACE_NEW (this->impl_,
-               TAO::Unknown_IDL_Type (tc));
-    }
-  else
-    {
-      this->impl_->type (tc);
-    }
-}
-
-int
-CORBA::Any::_tao_byte_order (void) const
-{
-  if (this->impl_ != 0)
-    {
-      return this->impl_->_tao_byte_order ();
-    }
-
-  return TAO_ENCAP_BYTE_ORDER;
-}
-
-void
-CORBA::Any::type (CORBA::TypeCode_ptr tc
-                  ACE_ENV_ARG_DECL)
-{
-  CORBA::Boolean equiv = 0;
-
-  if (this->impl_ != 0)
-    {
-      equiv =
-        this->impl_->_tao_get_typecode ()->equivalent (tc
-                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-
-  if (equiv)
-    {
-      this->impl_->type (tc);
-    }
-  else
-    {
-      ACE_THROW (CORBA::BAD_TYPECODE ());
-    }
-}
-
-void
-CORBA::Any::_tao_any_destructor (void *x)
-{
-  CORBA::Any *tmp = static_cast<CORBA::Any *> (x);
-  delete tmp;
-}
-
-// Deprecated by the OMG.
-const void *
-CORBA::Any::value (void) const
-{
-  if (this->impl_ != 0)
-    {
-      return this->impl_->value ();
-    }
-
-  return 0;
-}
-
-CORBA::Any::to_object::to_object (CORBA::Object_out obj)
-  : ref_ (obj.ptr ())
-{
-}
-
-CORBA::Any::to_abstract_base::to_abstract_base (CORBA::AbstractBase_ptr &obj)
-  : ref_ (obj)
-{
-}
-
-CORBA::Any::to_value::to_value (CORBA::ValueBase *& obj)
-  : ref_ (obj)
-{
-}
-
-CORBA::Boolean
-CORBA::Any::checked_to_object (CORBA::Object_ptr &_tao_elem) const
-{
-  if (this->impl_ == 0)
-    {
-      return 0;
-    }
-
-  return this->impl_->to_object (_tao_elem);
-}
-
-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);
-}
-
-CORBA::Boolean
-CORBA::Any::checked_to_abstract_base (
-    CORBA::AbstractBase_ptr &_tao_elem
-  ) const
-{
-  if (this->impl_ == 0)
-    {
-      return 0;
-    }
-
-  return this->impl_->to_abstract_base (_tao_elem);
-}
-
-// ****************************************************************
-
-CORBA::Any_var::Any_var (const CORBA::Any_var &r)
-  : ptr_ (0)
-{
-  if (r.ptr_ != 0)
-    {
-      ACE_NEW (this->ptr_,
-               CORBA::Any (*r.ptr_));
-    }
-}
-
-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)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-
-  if (r.ptr_ != 0)
-    {
-      ACE_NEW_RETURN (this->ptr_,
-                      CORBA::Any (*r.ptr_),
-                      *this);
-    }
-
-  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_var tc;
-
-  if ((cdr >> tc.out ()) == 0)
-    {
-      return 0;
-    }
-
-  ACE_TRY_NEW_ENV
-    {
-      TAO::Unknown_IDL_Type *impl = 0;
-      ACE_NEW_RETURN (impl,
-                      TAO::Unknown_IDL_Type (tc.in ()),
-                      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::Any::from_boolean b)
-{
-  TAO::Any_Basic_Impl::insert (*this,
-                               CORBA::_tc_boolean,
-                               &b.val_);
-}
-
-void
-CORBA::Any::operator<<= (CORBA::Any::from_octet o)
-{
-  TAO::Any_Basic_Impl::insert (*this,
-                               CORBA::_tc_octet,
-                               &o.val_);
-}
-
-void
-CORBA::Any::operator<<= (CORBA::Any::from_char c)
-{
-  TAO::Any_Basic_Impl::insert (*this,
-                               CORBA::_tc_char,
-                               &c.val_);
-}
-
-void
-CORBA::Any::operator<<= (CORBA::Any::from_wchar wc)
-{
-  TAO::Any_Basic_Impl::insert (*this,
-                               CORBA::_tc_wchar,
-                               &wc.val_);
-}
-
-void
-CORBA::Any::operator<<= (CORBA::Any::from_string s)
-{
-  if (s.bound_ > 0 && s.val_ != 0 && ACE_OS::strlen (s.val_) > s.bound_)
-    {
-      return;
-    }
-
-  TAO::Any_Special_Impl_T<
-      char,
-      CORBA::Any::from_string,
-      CORBA::Any::to_string
-    >::insert (*this,
-               TAO::Any_Impl::_tao_any_string_destructor,
-               CORBA::_tc_string,
-               s.nocopy_ ? s.val_ : CORBA::string_dup (s.val_),
-               s.bound_);
-}
-
-void
-CORBA::Any::operator<<= (CORBA::Any::from_wstring ws)
-{
-  if (ws.bound_ > 0 && ws.val_ != 0 && ACE_OS::wslen (ws.val_) > ws.bound_)
-    {
-      return;
-    }
-
-  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::_tc_wstring,
-               ws.nocopy_ ? ws.val_ : CORBA::wstring_dup (ws.val_),
-               ws.bound_);
-}
-
-// Insertion of the other basic types.
-
-void
-operator<<= (CORBA::Any &any, CORBA::Short s)
-{
-  TAO::Any_Basic_Impl::insert (any,
-                               CORBA::_tc_short,
-                               &s);
-}
-
-void
-operator<<= (CORBA::Any &any, CORBA::UShort us)
-{
-  TAO::Any_Basic_Impl::insert (any,
-                               CORBA::_tc_ushort,
-                               &us);
-}
-
-void
-operator<<= (CORBA::Any &any, CORBA::Long l)
-{
-  TAO::Any_Basic_Impl::insert (any,
-                               CORBA::_tc_long,
-                               &l);
-}
-
-void
-operator<<= (CORBA::Any &any, CORBA::ULong ul)
-{
-  TAO::Any_Basic_Impl::insert (any,
-                               CORBA::_tc_ulong,
-                               &ul);
-}
-
-void
-operator<<= (CORBA::Any &any, CORBA::LongLong ll)
-{
-  TAO::Any_Basic_Impl::insert (any,
-                               CORBA::_tc_longlong,
-                               &ll);
-}
-
-void
-operator<<= (CORBA::Any &any, CORBA::ULongLong ull)
-{
-  TAO::Any_Basic_Impl::insert (any,
-                               CORBA::_tc_ulonglong,
-                               &ull);
-}
-
-void
-operator<<= (CORBA::Any &any, CORBA::Float f)
-{
-  TAO::Any_Basic_Impl::insert (any,
-                               CORBA::_tc_float,
-                               &f);
-}
-
-void
-operator<<= (CORBA::Any &any, CORBA::Double d)
-{
-  TAO::Any_Basic_Impl::insert (any,
-                               CORBA::_tc_double,
-                               &d);
-}
-
-void
-operator<<= (CORBA::Any &any, CORBA::LongDouble ld)
-{
-  TAO::Any_Basic_Impl::insert (any,
-                               CORBA::_tc_longdouble,
-                               &ld);
-}
-
-// Insertion of Any - copying.
-void
-operator<<= (CORBA::Any &any, const CORBA::Any &a)
-{
-  TAO::Any_Dual_Impl_T<CORBA::Any>::insert_copy (
-      any,
-      CORBA::Any::_tao_any_destructor,
-      CORBA::_tc_any,
-      a
-    );
-}
-
-// Insertion of Any - non-copying.
-void
-operator<<= (CORBA::Any &any, CORBA::Any *a)
-{
-  TAO::Any_Dual_Impl_T<CORBA::Any>::insert (any,
-                                            CORBA::Any::_tao_any_destructor,
-                                            CORBA::_tc_any,
-                                            a);
-}
-
-// Insertion of TypeCode - copying.
-void
-operator<<= (CORBA::Any &any, CORBA::TypeCode_ptr tc)
-{
-  CORBA::TypeCode_ptr dup = CORBA::TypeCode::_duplicate (tc);
-  any <<= &dup;
-}
-
-// Insertion of TypeCode - non-copying.
-void
-operator<<= (CORBA::Any &any, CORBA::TypeCode_ptr * tc)
-{
-  TAO::Any_Impl_T<CORBA::TypeCode>::insert (
-      any,
-      CORBA::TypeCode::_tao_any_destructor,
-      CORBA::_tc_TypeCode,
-      *tc
-    );
-}
-
-// Insertion of CORBA object - copying.
-void
-operator<<= (CORBA::Any &any, const CORBA::Object_ptr obj)
-{
-  CORBA::Object_ptr dup = CORBA::Object::_duplicate (obj);
-  any <<= &dup;
-}
-
-// Insertion of CORBA object - non-copying.
-void
-operator<<= (CORBA::Any &any, CORBA::Object_ptr *objptr)
-{
-  TAO::Any_Impl_T<CORBA::Object>::insert (any,
-                                          CORBA::Object::_tao_any_destructor,
-                                          CORBA::_tc_Object,
-                                          *objptr);
-}
-
-// These are copying versions for unbounded (w)strings. They are not inlined,
-// to avoid use in Any.i before definition in ORB.i.
-
-void
-operator<<= (CORBA::Any &any, const char *s)
-{
-  TAO::Any_Special_Impl_T<
-      char,
-      CORBA::Any::from_string,
-      CORBA::Any::to_string
-    >::insert (any,
-               TAO::Any_Impl::_tao_any_string_destructor,
-               CORBA::_tc_string,
-               CORBA::string_dup (s),
-               0);
-}
-
-void
-operator<<= (CORBA::Any &any, const CORBA::WChar *ws)
-{
-  TAO::Any_Special_Impl_T<
-      CORBA::WChar,
-      CORBA::Any::from_wstring,
-      CORBA::Any::to_wstring
-    >::insert (any,
-               TAO::Any_Impl::_tao_any_wstring_destructor,
-               CORBA::_tc_wstring,
-               CORBA::wstring_dup (ws),
-               0);
-}
-
-// 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::Any::to_boolean b) const
-{
-  return TAO::Any_Basic_Impl::extract (*this,
-                                       CORBA::_tc_boolean,
-                                       &b.ref_);
-}
-
-CORBA::Boolean
-CORBA::Any::operator>>= (CORBA::Any::to_octet o) const
-{
-  return TAO::Any_Basic_Impl::extract (*this,
-                                       CORBA::_tc_octet,
-                                       &o.ref_);
-}
-
-CORBA::Boolean
-CORBA::Any::operator>>= (CORBA::Any::to_char c) const
-{
-  return TAO::Any_Basic_Impl::extract (*this,
-                                       CORBA::_tc_char,
-                                       &c.ref_);
-}
-
-CORBA::Boolean
-CORBA::Any::operator>>= (CORBA::Any::to_wchar wc) const
-{
-  return TAO::Any_Basic_Impl::extract (*this,
-                                       CORBA::_tc_wchar,
-                                       &wc.ref_);
-}
-
-CORBA::Boolean
-CORBA::Any::operator>>= (CORBA::Any::to_string s) const
-{
-  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::_tc_string,
-                  s.val_,
-                  s.bound_);
-}
-
-CORBA::Boolean
-CORBA::Any::operator>>= (CORBA::Any::to_wstring ws) const
-{
-  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::_tc_wstring,
-                  ws.val_,
-                  ws.bound_);
-}
-
-CORBA::Boolean
-CORBA::Any::operator>>= (CORBA::Any::to_object obj) const
-{
-  return this->checked_to_object (obj.ref_);
-}
-
-CORBA::Boolean
-CORBA::Any::operator>>= (CORBA::Any::to_abstract_base obj) const
-{
-  return this->checked_to_abstract_base (obj.ref_);
-}
-
-CORBA::Boolean
-CORBA::Any::operator>>= (CORBA::Any::to_value obj) const
-{
-  return this->checked_to_value (obj.ref_);
-}
-
-// Extraction into the other basic types.
-
-CORBA::Boolean
-operator>>= (const CORBA::Any &any, CORBA::Short &s)
-{
-  return TAO::Any_Basic_Impl::extract (any,
-                                       CORBA::_tc_short,
-                                       &s);
-}
-
-CORBA::Boolean
-operator>>= (const CORBA::Any &any, CORBA::UShort &us)
-{
-  return TAO::Any_Basic_Impl::extract (any,
-                                       CORBA::_tc_ushort,
-                                       &us);
-}
-
-CORBA::Boolean
-operator>>= (const CORBA::Any &any, CORBA::Long &l)
-{
-  return TAO::Any_Basic_Impl::extract (any,
-                                       CORBA::_tc_long,
-                                       &l);
-}
-
-CORBA::Boolean
-operator>>= (const CORBA::Any &any, CORBA::ULong &ul)
-{
-  return TAO::Any_Basic_Impl::extract (any,
-                                       CORBA::_tc_ulong,
-                                       &ul);
-}
-
-CORBA::Boolean
-operator>>= (const CORBA::Any &any, CORBA::LongLong &ll)
-{
-  return
-    TAO::Any_Basic_Impl::extract (any,
-                                  CORBA::_tc_longlong,
-                                  &ll);
-}
-
-CORBA::Boolean
-operator>>= (const CORBA::Any &any, CORBA::ULongLong &ull)
-{
-  return
-    TAO::Any_Basic_Impl::extract (any,
-                                  CORBA::_tc_ulonglong,
-                                  &ull);
-}
-
-CORBA::Boolean
-operator>>= (const CORBA::Any &any, CORBA::Float &f)
-{
-  return TAO::Any_Basic_Impl::extract (any,
-                                       CORBA::_tc_float,
-                                       &f);
-}
-
-CORBA::Boolean
-operator>>= (const CORBA::Any &any, CORBA::Double &d)
-{
-  return TAO::Any_Basic_Impl::extract (any,
-                                       CORBA::_tc_double,
-                                       &d);
-}
-
-CORBA::Boolean
-operator>>= (const CORBA::Any &any, CORBA::LongDouble &ld)
-{
-  return
-    TAO::Any_Basic_Impl::extract (any,
-                                  CORBA::_tc_longdouble,
-                                  &ld);
-}
-
-CORBA::Boolean
-operator>>= (const CORBA::Any &any, const CORBA::Any *&a)
-{
-  return TAO::Any_Dual_Impl_T<CORBA::Any>::extract (
-      any,
-      CORBA::Any::_tao_any_destructor,
-      CORBA::_tc_any,
-      a
-    );
-}
-
-CORBA::Boolean
-operator>>= (const CORBA::Any &any, const CORBA::Char *&s)
-{
-  return
-    TAO::Any_Special_Impl_T<
-        char,
-        CORBA::Any::from_string,
-        CORBA::Any::to_string
-      >::extract (any,
-                  TAO::Any_Impl::_tao_any_string_destructor,
-                  CORBA::_tc_string,
-                  s,
-                  0);
-}
-
-CORBA::Boolean
-operator>>= (const CORBA::Any &any, const CORBA::WChar *&ws)
-{
-  return
-    TAO::Any_Special_Impl_T<
-        CORBA::WChar,
-        CORBA::Any::from_wstring,
-        CORBA::Any::to_wstring
-      >::extract (any,
-                  TAO::Any_Impl::_tao_any_wstring_destructor,
-                  CORBA::_tc_wstring,
-                  ws,
-                  0);
-}
-
-CORBA::Boolean
-operator>>= (const CORBA::Any &any, CORBA::TypeCode_ptr &tc)
-{
-  return TAO::Any_Impl_T<CORBA::TypeCode>::extract (
-      any,
-      CORBA::TypeCode::_tao_any_destructor,
-      CORBA::_tc_TypeCode,
-      tc
-    );
-}
-
-// ================================================================
-// Any_Impl_T template specializations.
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::Object>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return 1;
-  }
-}
-
-// ================================================================
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-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_Dual_Impl_T<CORBA::Any>;
-template class TAO::Any_Impl_T<CORBA::TypeCode>;
-
-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::Arg_Traits<CORBA::Any>;
-template class TAO::Var_Size_Arg_Traits_T<CORBA::Any,
-                                          CORBA::Any_var,
-                                          CORBA::Any_out>;
-
-template class TAO::In_Var_Size_Argument_T<CORBA::Any>;
-template class TAO::Out_Var_Size_Argument_T<CORBA::Any, CORBA::Any_out>;
-template class TAO::Inout_Var_Size_Argument_T<CORBA::Any>;
-template class TAO::Ret_Var_Size_Argument_T<CORBA::Any, CORBA::Any_var>;
-
-#if 0
-// Needed in the future..
-template class TAO::SArg_Traits<CORBA::Any>;
-template class TAO::Var_Size_SArg_Traits_T<CORBA::Any,
-                                           CORBA::Any_var,
-                                           CORBA::Any_out>;
-template class TAO::In_Var_Size_SArgument_T<CORBA::Any>;
-template class TAO::Inout_Var_Size_SArgument_T<CORBA::Any>;
-template class TAO::Out_Var_Size_SArgument_T<CORBA::Any,
-                                             CORBA::Any_var>;
-template class TAO::Ret_Var_Size_SArgument_T<CORBA::Any,
-                                             CORBA::Any_var>;
-#endif /*if 0*/
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#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_Dual_Impl_T<CORBA::Any>
-#pragma instantiate TAO::Any_Impl_T<CORBA::TypeCode>
-
-#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::Arg_Traits<CORBA::Any>
-#pragma instantiate TAO::Var_Size_Arg_Traits_T<CORBA::Any, \
-                                               CORBA::Any_var, \
-                                               CORBA::Any_out>
-#pragma instantiate TAO::Var_Size_Arg_Traits_T<CORBA::Any, \
-                                          CORBA::Any_var, \
-                                          CORBA::Any_out>
-#pragma instantiate TAO::In_Var_Size_Argument_T<CORBA::Any>
-#pragma instantiate TAO::Inout_Var_Size_Argument_T<CORBA::Any>
-#pragma instantiate TAO::Out_Var_Size_Argument_T<CORBA::Any, \
-                                            CORBA::Any_out>
-#pragma instantiate TAO::Ret_Var_Size_Argument_T<CORBA::Any, \
-                                            CORBA::Any_var>
-
-#pragma instantiate TAO::SArg_Traits<CORBA::Any>
-#pragma instantiate TAO::Var_Size_SArg_Traits_T<CORBA::Any, \
-                                           CORBA::Any_var, \
-                                           CORBA::Any_out>
-#pragma instantiate TAO::In_Var_Size_SArgument_T<CORBA::Any>
-#pragma instantiate TAO::Inout_Var_Size_SArgument_T<CORBA::Any>
-#pragma instantiate TAO::Out_Var_Size_SArgument_T<CORBA::Any, \
-                                             CORBA::Any_var>
-#pragma instantiate TAO::Ret_Var_Size_SArgument_T<CORBA::Any, \
-                                             CORBA::Any_var>
-
-#pragma instantiate TAO::In_Var_Size_Argument_T<CORBA::Any>
-
-#pragma instantiate TAO::Out_Var_Size_Argument_T<CORBA::Any,  \
-                                                 CORBA::Any_out>
-#pragma instantiate TAO::Inout_Var_Size_Argument_T<CORBA::Any>
-#pragma instantiate TAO::Ret_Var_Size_Argument_T<CORBA::Any, \
-                                                 CORBA::Any_var>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Any.h b/TAO/tao/Any.h
deleted file mode 100644
index 347ac965473..00000000000
--- a/TAO/tao/Any.h
+++ /dev/null
@@ -1,403 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Any.h
- *
- *  $Id$
- *
- *  @author Carlos O'Ryan
- *  @author Jeff Parsons
- */
-//=============================================================================
-
-#ifndef TAO_ANY_H
-#define TAO_ANY_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/CORBA_methods.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Pseudo_VarOut_T.h"
-#include "tao/Arg_Traits_T.h"
-
-#include "ace/CDR_Stream.h"
-#include "ace/CORBA_macros.h"
-
-namespace TAO
-{
-  class Any_Impl;
-}
-
-namespace CORBA
-{
-  class Any;
-  typedef Any *Any_ptr;
-  class Any_var;
-
-  class TypeCode;
-  typedef TypeCode *TypeCode_ptr;
-
-  class Object;
-  typedef Object *Object_ptr;
-  typedef TAO_Pseudo_Var_T<Object> Object_var;
-  typedef TAO_Pseudo_Out_T<Object, Object_var> Object_out;
-
-  class AbstractBase;
-  typedef AbstractBase *AbstractBase_ptr;
-
-  class ValueBase;
-  class Exception;
-
-  /**
-   * @class Any
-   *
-   * @brief Generic container for IDL types.
-   *
-   * 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;
-
-    Any (void);
-    Any (const Any &);
-
-    ~Any (void);
-
-    Any &operator= (const Any &);
-    TAO::Any_Impl *impl (void) const;
-
-    /// Used in our destruction if we ourselves are stored in an Any.
-    static void _tao_any_destructor (void *);
-
-    /// 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;
-    typedef ACE_OutputCDR::from_char from_char;
-    typedef ACE_OutputCDR::from_wchar from_wchar;
-    typedef ACE_OutputCDR::from_string from_string;
-    typedef ACE_OutputCDR::from_wstring from_wstring;
-
-    /// Insertion of the special types.
-
-    void operator<<= (from_boolean);
-    void operator<<= (from_char);
-    void operator<<= (from_wchar);
-    void operator<<= (from_octet);
-    void operator<<= (from_string);
-    void operator<<= (from_wstring);
-
-    /// 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;
-    typedef ACE_InputCDR::to_wchar to_wchar;
-    typedef ACE_InputCDR::to_octet to_octet;
-    typedef ACE_InputCDR::to_string to_string;
-    typedef ACE_InputCDR::to_wstring to_wstring;
-
-    /// 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.
-      explicit to_object (Object_out obj);
-      Object_ptr &ref_;
-    };
-
-    struct TAO_Export to_abstract_base
-    {
-      explicit to_abstract_base (AbstractBase_ptr &obj);
-      AbstractBase_ptr &ref_;
-    };
-
-    struct TAO_Export to_value
-    {
-      explicit to_value (ValueBase *&base);
-      ValueBase *&ref_;
-    };
-
-    /// Extraction of the special types.
-
-    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;
-
-    /// TAO-specific signature.
-    void replace (TAO::Any_Impl *);
-
-    /// Return TypeCode of the element stored in the Any.
-    TypeCode_ptr type (void) const;
-
-    /// For use along with <<= of a value of aliased type when the alias must
-    /// be preserved.
-    void type (TypeCode_ptr
-               ACE_ENV_ARG_DECL);
-
-    /// TAO extension, does not return a duplicate.
-    CORBA::TypeCode_ptr _tao_get_typecode (void) const;
-
-    /// TAO extension.
-    void _tao_set_typecode (const CORBA::TypeCode_ptr);
-
-    int _tao_byte_order (void) const;
-
-    /// @deprecated
-    /// Deprecated by the OMG. This no longer appears in
-    /// the C++ mapping. It is here only for backward
-    /// compatibility. It is no longer (as of 5/26/04)
-    /// used anywhere in TAO.
-    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;
-
-    // Unimplemented - hides unsigned char insert/extract.
-    void operator<<= (unsigned char);
-    CORBA::Boolean operator>>= (unsigned char&) const;
-
-  private:
-    TAO::Any_Impl *impl_;
-
-    friend class TAO_Marshal_Any;
-  };
-
-  /**
-   * @class CORBA::Any_var
-   *
-   * @brief Provide for automatic storage deallocation on going out of
-   * scope.
-   */
-  class TAO_Export Any_var
-  {
-  public:
-    Any_var (void);
-    Any_var (Any *a);
-    Any_var (const Any_var &);
-    ~Any_var (void);
-
-    Any_var &operator= (Any *);
-
-    /**
-     * Assignment from an Any_var
-     * This operation requires memory allocation.
-     * If the allocation fails, *this is returned
-     * unmodified.
-     */
-    Any_var &operator= (const Any_var &);
-
-    /// Arrow operator (smart pointer).
-    Any *operator-> (void);
-
-    /// Cast.
-    operator const Any *() const;
-
-    /// Cast.
-    operator Any *&();
-
-    /// For in Any parameter.
-    const Any &in (void) const;
-
-    /// For inout Any parameter.
-    Any &inout (void);
-
-    /// For out Any parameter.
-    Any *&out (void);
-
-    /// For Any return type.
-    Any *_retn (void);
-
-    /// TAO specific extension
-    Any *ptr (void) const;
-  private:
-    /// Holds the Any.
-    Any *ptr_;
-  };
-
-  /**
-   * @class CORBA::Any_out
-   *
-   * @brief CORBA::Any_out
-   *
-   * 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 &);
-
-    /// Assignment from a Any_out.
-    Any_out &operator= (const Any_out &s);
-
-    /// Assignment from a Any.
-    Any_out &operator= (Any *);
-
-    /// Cast.
-    operator Any *&();
-
-    /// Return underlying instance.
-    Any *& ptr (void);
-
-    Any *operator-> (void);
-
-  private:
-    /// Assignment from _var disallowed.
-    void operator= (const Any_var &);
-
-  private:
-    /// Instance.
-    Any *&ptr_;
-  };
-}
-
-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 &, CORBA::TypeCode_ptr *);
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::Object_ptr);
-TAO_Export void operator<<= (CORBA::Any &, CORBA::Object_ptr *);
-
-/// 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 *&);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
-                                       CORBA::TypeCode_ptr &);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
-                                       const CORBA::Char *&);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
-                                       const CORBA::WChar *&);
-
-#if defined (__ACE_INLINE__)
-# include "tao/Any.i"
-#else
-
-/// 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>>= (const CORBA::Any_var &,
-                                       CORBA::Any::to_octet);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
-                                       CORBA::Any::to_char);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
-                                       CORBA::Any::to_wchar);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
-                                       CORBA::Any::to_string);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
-                                       CORBA::Any::to_wstring);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
-                                       CORBA::Any::to_object);
-
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ANY_H */
diff --git a/TAO/tao/Any.i b/TAO/tao/Any.i
deleted file mode 100644
index 3e700c0bca1..00000000000
--- a/TAO/tao/Any.i
+++ /dev/null
@@ -1,368 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-ACE_INLINE TAO::Any_Impl *
-CORBA::Any::impl (void) const
-{
-  return this->impl_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::Any_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::Any_var::Any_var (void)
-  : ptr_ (0)
-{
-}
-
-ACE_INLINE
-CORBA::Any_var::Any_var (CORBA::Any *p)
-  : ptr_ (p)
-{
-}
-
-ACE_INLINE
-CORBA::Any_var::~Any_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::Any_var::operator CORBA::Any *&()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::Any_var::operator const CORBA::Any *() const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Any *
-CORBA::Any_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const CORBA::Any &
-CORBA::Any_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::Any &
-CORBA::Any_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::Any *&
-CORBA::Any_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Any *
-CORBA::Any_var::_retn (void)
-{
-  CORBA::Any *temp = this->ptr_;
-  this->ptr_ = 0;
-  return temp;
-}
-
-ACE_INLINE CORBA::Any *
-CORBA::Any_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// CORBA::Any_var insertion operators
-// *************************************************************
-
-ACE_INLINE void
-operator <<= (CORBA::Any_var &lhs, CORBA::Short rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA::Any_var &lhs, CORBA::UShort rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA::Any_var &lhs, CORBA::Long rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA::Any_var &lhs, CORBA::ULong rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA::Any_var &lhs, CORBA::LongLong rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA::Any_var &lhs, CORBA::ULongLong rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA::Any_var &lhs, CORBA::Float rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA::Any_var &lhs, CORBA::Double rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA::Any_var &lhs, const CORBA::Any& rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA::Any_var &lhs, const char* rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA::Any_var &lhs, CORBA::TypeCode_ptr rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA::Any_var &lhs, const CORBA::Object_ptr rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA::Any_var &lhs, CORBA::Any::from_boolean rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA::Any_var &lhs, CORBA::Any::from_char rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA::Any_var &lhs, CORBA::Any::from_wchar rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA::Any_var &lhs, CORBA::Any::from_octet rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA::Any_var &lhs, CORBA::Any::from_string rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA::Any_var &lhs, CORBA::Any::from_wstring rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-// *************************************************************
-// CORBA::Any_var extraction operators
-// *************************************************************
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, CORBA::Short &rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, CORBA::UShort &rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, CORBA::Long &rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, CORBA::ULong &rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, CORBA::LongLong &rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, CORBA::ULongLong &rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, CORBA::Float &rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, CORBA::Double &rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, const CORBA::Any *&rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, CORBA::TypeCode_ptr &rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, const char *&rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, const CORBA::WChar *&rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, CORBA::Any::to_boolean rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, CORBA::Any::to_octet rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, CORBA::Any::to_char rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, CORBA::Any::to_wchar rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, CORBA::Any::to_string rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, CORBA::Any::to_wstring rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, CORBA::Any::to_object rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::Any_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::Any_out::Any_out (CORBA::Any *&s)
-  : ptr_ (s)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::Any_out::Any_out (CORBA::Any_var &s)
-  : ptr_ (s.out ())
-{
-}
-
-ACE_INLINE
-CORBA::Any_out::Any_out (const CORBA::Any_out &s)
-  : ptr_ (s.ptr_)
-{
-}
-
-ACE_INLINE CORBA::Any_out &
-CORBA::Any_out::operator= (const CORBA::Any_out &s)
-{
-  this->ptr_ = s.ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::Any_out &
-CORBA::Any_out::operator= (CORBA::Any *s)
-{
-  this->ptr_ = s;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::Any_out::operator CORBA::Any *&()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Any *&
-CORBA::Any_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Any *
-CORBA::Any_out::operator-> (void)
-{
-  return this->ptr_;
-}
diff --git a/TAO/tao/AnySeq.pidl b/TAO/tao/AnySeq.pidl
deleted file mode 100644
index fb3a570b657..00000000000
--- a/TAO/tao/AnySeq.pidl
+++ /dev/null
@@ -1,31 +0,0 @@
-// -*- IDL -*-
-//
-// $Id$
-
-// ================================================================
-/**
- * This file was used to generate the code in AnySeq*.*
- * The command used to generate code is:
- *
- *     tao_idl
- *        -o orig -Ge 1 -Sc -GA -SS -Sci
- *          -Wb,export_macro=TAO_Export
- *          -Wb,export_include="tao/TAO_Export.h"
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          AnySeq.pidl
- *
- */
-// ================================================================
-
-#ifndef TAO_CORBA_ANY_SEQ_IDL
-#define TAO_CORBA_ANY_SEQ_IDL
-
-#pragma prefix "omg.org"
-
-module CORBA
-{
-  typedef sequence<any> AnySeq;
-};
-
-#endif  /* TAO_CORBA_ANY_SEQ_IDL */
diff --git a/TAO/tao/AnySeqA.cpp b/TAO/tao/AnySeqA.cpp
deleted file mode 100644
index 55b9e326af5..00000000000
--- a/TAO/tao/AnySeqA.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-// -*- 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/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "AnySeqC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_CORBA_AnySeq_GUARD
-#define _TAO_TYPECODE_CORBA_AnySeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_AnySeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_any,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_AnySeq_0 =
-      &CORBA_AnySeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_AnySeq_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_AnySeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/AnySeq:1.0",
-    "AnySeq",
-    &TAO::TypeCode::tc_CORBA_AnySeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_AnySeq =
-    &_tao_tc_CORBA_AnySeq;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::AnySeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::AnySeq>::insert_copy (
-      _tao_any,
-      CORBA::AnySeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_AnySeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::AnySeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::AnySeq>::insert (
-      _tao_any,
-      CORBA::AnySeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_AnySeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::AnySeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::AnySeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::AnySeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::AnySeq>::extract (
-        _tao_any,
-        CORBA::AnySeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_AnySeq_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/AnySeqC.cpp b/TAO/tao/AnySeqC.cpp
deleted file mode 100644
index f04c69e6e47..00000000000
--- a/TAO/tao/AnySeqC.cpp
+++ /dev/null
@@ -1,171 +0,0 @@
-// -*- 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/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "AnySeqC.h"
-#include "tao/CDR.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:70
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_CORBA_ANYSEQ_CS_)
-#define _CORBA_ANYSEQ_CS_
-
-CORBA::AnySeq::AnySeq (void)
-{}
-
-CORBA::AnySeq::AnySeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::Any
-      >
-    (max)
-{}
-
-CORBA::AnySeq::AnySeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::Any * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::Any
-      >
-    (max, length, buffer, release)
-{}
-
-CORBA::AnySeq::AnySeq (
-    const AnySeq &seq
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::Any
-      >
-    (seq)
-{}
-
-CORBA::AnySeq::~AnySeq (void)
-{}
-
-void CORBA::AnySeq::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  AnySeq * _tao_tmp_pointer =
-    static_cast<AnySeq *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_CORBA_AnySeq_CPP_
-#define _TAO_CDR_OP_CORBA_AnySeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::AnySeq &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      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 false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::AnySeq &_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 false;
-        }
-      
-      // 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 true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      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 false;
-}
-
-#endif /* _TAO_CDR_OP_CORBA_AnySeq_CPP_ */
diff --git a/TAO/tao/AnySeqC.h b/TAO/tao/AnySeqC.h
deleted file mode 100644
index 18803cc7ac3..00000000000
--- a/TAO/tao/AnySeqC.h
+++ /dev/null
@@ -1,179 +0,0 @@
-// -*- 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/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_ANYSEQC_H_
-#define _TAO_IDL_ORIG_ANYSEQC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Any.h"
-#include "tao/TypeCode.h"
-#include "tao/Sequence_T.h"
-#include "tao/Seq_Var_T.h"
-#include "tao/Seq_Out_T.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#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
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace CORBA
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_CORBA_ANYSEQ_CH_)
-#define _CORBA_ANYSEQ_CH_
-  
-  class AnySeq;
-  
-  typedef
-    TAO_VarSeq_Var_T<
-        AnySeq,
-        CORBA::Any
-      >
-    AnySeq_var;
-  
-  typedef
-    TAO_Seq_Out_T<
-        AnySeq,
-        AnySeq_var,
-        CORBA::Any
-      >
-    AnySeq_out;
-  
-  class TAO_Export AnySeq
-    : public
-        TAO_Unbounded_Sequence<
-            CORBA::Any
-          >
-  {
-  public:
-    AnySeq (void);
-    AnySeq (CORBA::ULong max);
-    AnySeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA::Any* buffer, 
-        CORBA::Boolean release = 0
-      );
-    AnySeq (const AnySeq &);
-    ~AnySeq (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef AnySeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_AnySeq;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module CORBA
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::AnySeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::AnySeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::AnySeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::AnySeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_CORBA_AnySeq_H_
-#define _TAO_CDR_OP_CORBA_AnySeq_H_
-
-TAO_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::AnySeq &
-  );
-TAO_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::AnySeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_AnySeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#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/AnyTypeCode.mpc b/TAO/tao/AnyTypeCode.mpc
new file mode 100644
index 00000000000..528ca5b12be
--- /dev/null
+++ b/TAO/tao/AnyTypeCode.mpc
@@ -0,0 +1,117 @@
+//$Id$
+project : taolib, core {
+  sharedname   = TAO_AnyTypeCode
+  dynamicflags = TAO_ANYTYPECODE_BUILD_DLL
+
+  Source_Files {
+    AnyTypeCode/Alias_TypeCode_Static.cpp
+    AnyTypeCode/Any.cpp
+    AnyTypeCode/AnySeqA.cpp
+    AnyTypeCode/AnySeqC.cpp
+    AnyTypeCode/Any_Basic_Impl.cpp
+    AnyTypeCode/Any_Impl.cpp
+    AnyTypeCode/Any_SystemException.cpp
+    AnyTypeCode/Any_Unknown_IDL_Type.cpp
+    AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp
+    AnyTypeCode/append.cpp
+    AnyTypeCode/BooleanSeqA.cpp
+    AnyTypeCode/BoundsA.cpp
+    AnyTypeCode/BoundsC.cpp
+    AnyTypeCode/CharSeqA.cpp
+    AnyTypeCode/CONV_FRAMEA.cpp
+    AnyTypeCode/CurrentA.cpp
+    AnyTypeCode/DomainA.cpp
+    AnyTypeCode/DoubleSeqA.cpp
+    AnyTypeCode/DynamicA.cpp
+    AnyTypeCode/DynamicC.cpp
+    AnyTypeCode/Dynamic_ParameterA.cpp
+    AnyTypeCode/Dynamic_ParameterC.cpp
+    AnyTypeCode/Empty_Param_TypeCode.cpp
+    AnyTypeCode/Enum_TypeCode_Static.cpp
+    AnyTypeCode/ExceptionA.cpp
+    AnyTypeCode/FloatSeqA.cpp
+    AnyTypeCode/GIOPA.cpp
+    AnyTypeCode/IIOPA.cpp
+    AnyTypeCode/IIOP_EndpointsA.cpp
+    AnyTypeCode/IOP_IORA.cpp
+    AnyTypeCode/LongDoubleSeqA.cpp
+    AnyTypeCode/LongLongSeqA.cpp
+    AnyTypeCode/LongSeqA.cpp
+    AnyTypeCode/Marshal.cpp
+    AnyTypeCode/Messaging_PolicyValueA.cpp
+    AnyTypeCode/NVList.cpp
+    AnyTypeCode/NVList_Adapter_Impl.cpp
+    AnyTypeCode/ObjectIdListA.cpp
+    AnyTypeCode/Objref_TypeCode_Static.cpp
+    AnyTypeCode/OctetSeqA.cpp
+    AnyTypeCode/orb_typesA.cpp
+    AnyTypeCode/ParameterModeA.cpp
+    AnyTypeCode/PI_ForwardA.cpp
+    AnyTypeCode/PolicyA.cpp
+    AnyTypeCode/Policy_ForwardA.cpp
+    AnyTypeCode/PortableInterceptorA.cpp
+    AnyTypeCode/Sequence_TypeCode_Static.cpp
+    AnyTypeCode/ServicesA.cpp
+    AnyTypeCode/ShortSeqA.cpp
+    AnyTypeCode/skip.cpp
+    AnyTypeCode/StringSeqA.cpp
+    AnyTypeCode/String_TypeCode_Static.cpp
+    AnyTypeCode/Struct_TypeCode_Static.cpp
+    AnyTypeCode/SystemExceptionA.cpp
+    AnyTypeCode/TAOA.cpp
+    AnyTypeCode/TimeBaseA.cpp
+    AnyTypeCode/True_RefCount_Policy.cpp
+    AnyTypeCode/TypeCode.cpp
+    AnyTypeCode/TypeCodeA.cpp
+    AnyTypeCode/TypeCode_CDR_Extraction.cpp
+    AnyTypeCode/TypeCode_Constants.cpp
+    AnyTypeCode/ULongLongSeqA.cpp
+    AnyTypeCode/ULongSeqA.cpp
+    AnyTypeCode/Union_TypeCode_Static.cpp
+    AnyTypeCode/UShortSeqA.cpp
+    AnyTypeCode/Value_TypeCode_Static.cpp
+    AnyTypeCode/ValueModifierC.cpp
+    AnyTypeCode/ValueModifierA.cpp
+    AnyTypeCode/VisibilityA.cpp
+    AnyTypeCode/VisibilityC.cpp
+    AnyTypeCode/WCharSeqA.cpp
+    AnyTypeCode/WrongTransactionA.cpp
+    AnyTypeCode/WStringSeqA.cpp
+  }
+
+  Header_Files {
+    AnyTypeCode/*.h
+  }
+
+  Inline_Files {
+    AnyTypeCode/*.inl
+  }
+
+
+  Template_Files {
+    AnyTypeCode/*_T.cpp
+    AnyTypeCode/Alias_TypeCode.cpp
+    AnyTypecode/Enum_TypeCode.cpp
+    AnyTypecode/Fixed_TypeCode.cpp
+    AnyTypecode/Objref_TypeCode.cpp
+    AnyTypecode/Recursive_Type_TypeCode.cpp
+    AnyTypecode/Sequence_TypeCode.cpp
+    AnyTypecode/String_TypeCode.cpp
+    AnyTypecode/Struct_TypeCode.cpp
+    AnyTypecode/TypeCode_Base_Attributes.cpp
+    AnyTypecode/TypeCode_Case.cpp
+    AnyTypecode/Union_TypeCode.cpp
+    AnyTypecode/Value_TypeCode.cpp
+  }
+
+  Resource_Files {
+    AnyTypeCode
+  }
+
+  PIDL_Files {
+  }
+
+  Pkgconfig_Files {
+    AnyTypeCode/TAO_AnyTypeCode.pc.in
+  }
+}
diff --git a/TAO/tao/AnyTypeCode_Adapter.cpp b/TAO/tao/AnyTypeCode_Adapter.cpp
new file mode 100644
index 00000000000..ef7e0adf569
--- /dev/null
+++ b/TAO/tao/AnyTypeCode_Adapter.cpp
@@ -0,0 +1,12 @@
+// @(#) $Id$
+
+#include "tao/AnyTypeCode_Adapter.h"
+
+ACE_RCSID (tao,
+           TAO_AnyTypeCode_Adapter,
+           "$Id$")
+
+TAO_AnyTypeCode_Adapter::~TAO_AnyTypeCode_Adapter (void)
+{
+}
+
diff --git a/TAO/tao/AnyTypeCode_Adapter.h b/TAO/tao/AnyTypeCode_Adapter.h
new file mode 100644
index 00000000000..5050a148c32
--- /dev/null
+++ b/TAO/tao/AnyTypeCode_Adapter.h
@@ -0,0 +1,126 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    AnyTypeCode_Adapter.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+
+#ifndef TAO_ANYTYPECODE_ADAPTER
+#define TAO_ANYTYPECODE_ADAPTER
+
+#include /**/ "ace/pre.h"
+
+#include "tao/TAO_Export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/Service_Object.h"
+#include "ace/CDR_Stream.h"
+
+#include "tao/Basic_Types.h"
+
+namespace CORBA
+{
+  class TypeCode;
+  typedef TypeCode *TypeCode_ptr;
+
+  class Any;
+
+  class Policy;
+  typedef Policy *Policy_ptr;
+}
+
+
+/**
+ * @class TAO_AnyTypeCode_Adapter
+ */
+class TAO_Export TAO_AnyTypeCode_Adapter
+  : public ACE_Service_Object
+{
+public:
+  virtual ~TAO_AnyTypeCode_Adapter (void);
+
+#define ANYTYPECODE__EXCEPTION_LIST \
+    TAO_SYSTEM_EXCEPTION (UNKNOWN) \
+    TAO_SYSTEM_EXCEPTION (BAD_PARAM) \
+    TAO_SYSTEM_EXCEPTION (NO_MEMORY) \
+    TAO_SYSTEM_EXCEPTION (IMP_LIMIT) \
+    TAO_SYSTEM_EXCEPTION (COMM_FAILURE) \
+    TAO_SYSTEM_EXCEPTION (INV_OBJREF) \
+    TAO_SYSTEM_EXCEPTION (OBJECT_NOT_EXIST) \
+    TAO_SYSTEM_EXCEPTION (NO_PERMISSION) \
+    TAO_SYSTEM_EXCEPTION (INTERNAL) \
+    TAO_SYSTEM_EXCEPTION (MARSHAL) \
+    TAO_SYSTEM_EXCEPTION (INITIALIZE) \
+    TAO_SYSTEM_EXCEPTION (NO_IMPLEMENT) \
+    TAO_SYSTEM_EXCEPTION (BAD_TYPECODE) \
+    TAO_SYSTEM_EXCEPTION (BAD_OPERATION) \
+    TAO_SYSTEM_EXCEPTION (NO_RESOURCES) \
+    TAO_SYSTEM_EXCEPTION (NO_RESPONSE) \
+    TAO_SYSTEM_EXCEPTION (PERSIST_STORE) \
+    TAO_SYSTEM_EXCEPTION (BAD_INV_ORDER) \
+    TAO_SYSTEM_EXCEPTION (TRANSIENT) \
+    TAO_SYSTEM_EXCEPTION (FREE_MEM) \
+    TAO_SYSTEM_EXCEPTION (INV_IDENT) \
+    TAO_SYSTEM_EXCEPTION (INV_FLAG) \
+    TAO_SYSTEM_EXCEPTION (INTF_REPOS) \
+    TAO_SYSTEM_EXCEPTION (BAD_CONTEXT) \
+    TAO_SYSTEM_EXCEPTION (OBJ_ADAPTER) \
+    TAO_SYSTEM_EXCEPTION (DATA_CONVERSION) \
+    TAO_SYSTEM_EXCEPTION (INV_POLICY) \
+    TAO_SYSTEM_EXCEPTION (REBIND) \
+    TAO_SYSTEM_EXCEPTION (TIMEOUT) \
+    TAO_SYSTEM_EXCEPTION (TRANSACTION_UNAVAILABLE) \
+    TAO_SYSTEM_EXCEPTION (TRANSACTION_MODE) \
+    TAO_SYSTEM_EXCEPTION (TRANSACTION_REQUIRED) \
+    TAO_SYSTEM_EXCEPTION (TRANSACTION_ROLLEDBACK) \
+    TAO_SYSTEM_EXCEPTION (INVALID_TRANSACTION) \
+    TAO_SYSTEM_EXCEPTION (CODESET_INCOMPATIBLE) \
+    TAO_SYSTEM_EXCEPTION (BAD_QOS) \
+    TAO_SYSTEM_EXCEPTION (INVALID_ACTIVITY) \
+    TAO_SYSTEM_EXCEPTION (ACTIVITY_COMPLETED) \
+    TAO_SYSTEM_EXCEPTION (ACTIVITY_REQUIRED) \
+    TAO_SYSTEM_EXCEPTION (THREAD_CANCELLED) \
+    TAO_SYSTEM_EXCEPTION (WrongTransaction) \
+    TAO_SYSTEM_EXCEPTION (PolicyError) \
+    TAO_SYSTEM_EXCEPTION (InvalidPolicies)
+
+#define TAO_SYSTEM_EXCEPTION(name) \
+  virtual CORBA::TypeCode_ptr _tao_type_ ## name (void) const = 0;
+
+ANYTYPECODE__EXCEPTION_LIST
+#undef  TAO_SYSTEM_EXCEPTION
+
+  virtual void insert_into_any (CORBA::Any * any, CORBA::Char const * mychar) = 0;
+
+  virtual void insert_into_any (CORBA::Any * any, CORBA::WChar const * mywchar) = 0;
+
+  virtual void insert_into_any (CORBA::Any * any, CORBA::Policy_ptr policy) = 0;
+
+  virtual void insert_into_any (CORBA::Any * any, CORBA::Policy_ptr * policy) = 0;
+
+  virtual void insert_into_any (CORBA::Any * any, CORBA::ULong value) = 0;
+
+  virtual void insert_into_any (CORBA::Any * any, CORBA::Long value) = 0;
+
+  virtual void insert_into_any (CORBA::Any * any, CORBA::Short value) = 0;
+
+  virtual void insert_into_any (CORBA::Any * any, ACE_OutputCDR::from_wchar value) = 0;
+
+  virtual void insert_into_any (CORBA::Any * any, ACE_OutputCDR::from_char value) = 0;
+
+  virtual void insert_into_any (CORBA::Any * any, ACE_OutputCDR::from_octet value) = 0;
+
+  virtual void insert_into_any (CORBA::Any * any, ACE_OutputCDR::from_boolean value) = 0;
+};
+
+#include /**/ "ace/post.h"
+#endif /* TAO_ANYTYPECODE_ADAPTER */
diff --git a/TAO/tao/Any_Arg_Traits.h b/TAO/tao/Any_Arg_Traits.h
deleted file mode 100644
index 5cbf50e0558..00000000000
--- a/TAO/tao/Any_Arg_Traits.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Any_Arg_Traits.h
- *
- *  $Id$
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
-
-#ifndef TAO_ANY_ARG_TRAITS_H
-#define TAO_ANY_ARG_TRAITS_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TAO_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Var_Size_Argument_T.h"
-#include "tao/Arg_Traits_T.h"
-
-namespace CORBA
-{
-  class Any;
-  class Any_var;
-  class Any_out;
-}
-
-namespace TAO
-{
-  template<>
-  class TAO_Export Arg_Traits<CORBA::Any>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::Any,
-            CORBA::Any_var,
-            CORBA::Any_out
-          >
-  {
-  };
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ANY_ARG_TRAITS_H */
diff --git a/TAO/tao/Any_Array_Impl_T.cpp b/TAO/tao/Any_Array_Impl_T.cpp
deleted file mode 100644
index de648b9cd5e..00000000000
--- a/TAO/tao/Any_Array_Impl_T.cpp
+++ /dev/null
@@ -1,162 +0,0 @@
-// $Id$
-
-#ifndef TAO_ANY_ARRAY_IMPL_T_C
-#define TAO_ANY_ARRAY_IMPL_T_C
-
-#include "tao/Any_Array_Impl_T.h"
-#include "tao/Any_Unknown_IDL_Type.h"
-#include "tao/Marshal.h"
-#include "tao/debug.h"
-#include "tao/CDR.h"
-#include "tao/SystemException.h"
-
-#include "ace/CORBA_macros.h"
-#include "ace/Auto_Ptr.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Any_Array_Impl_T.inl"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           Any_Array_Impl_T,
-           "$Id$")
-
-template<typename T_slice, typename T_forany>
-TAO::Any_Array_Impl_T<T_slice, T_forany>::Any_Array_Impl_T (
-    _tao_destructor destructor,
-    CORBA::TypeCode_ptr tc,
-    T_slice * const val
-  )
-  : Any_Impl (destructor,
-              tc),
-    value_ (val)
-{
-}
-
-template<typename T_slice, typename T_forany>
-TAO::Any_Array_Impl_T<T_slice, T_forany>::~Any_Array_Impl_T (void)
-{
-}
-
-template<typename T_slice, typename T_forany>
-void
-TAO::Any_Array_Impl_T<T_slice, T_forany>::insert (CORBA::Any & any,
-                                                  _tao_destructor destructor,
-                                                  CORBA::TypeCode_ptr tc,
-                                                  T_slice * const value)
-{
-  TAO::Any_Array_Impl_T<T_slice, T_forany> *new_impl = 0;
-  typedef TAO::Any_Array_Impl_T<T_slice, T_forany> ARRAY_ANY_IMPL;
-  ACE_NEW (new_impl,
-           ARRAY_ANY_IMPL (destructor,
-                           tc,
-                           value));
-  any.replace (new_impl);
-}
-
-template<typename T_slice, typename T_forany>
-CORBA::Boolean
-TAO::Any_Array_Impl_T<T_slice, T_forany>::extract (const CORBA::Any & any,
-                                                   _tao_destructor destructor,
-                                                   CORBA::TypeCode_ptr tc,
-                                                   T_slice *& _tao_elem)
-{
-  _tao_elem = 0;
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::TypeCode_ptr any_tc = any._tao_get_typecode ();
-      const 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 ();
-
-      if (!impl->encoded ())
-        {
-          TAO::Any_Array_Impl_T<T_slice, T_forany> *narrow_impl =
-            dynamic_cast <TAO::Any_Array_Impl_T <T_slice, T_forany> *> (impl);
-
-          if (narrow_impl == 0)
-            {
-              return 0;
-            }
-
-          _tao_elem = reinterpret_cast <T_slice*> (narrow_impl->value_);
-          return 1;
-        }
-
-      TAO::Any_Array_Impl_T<T_slice, T_forany> *replacement = 0;
-      typedef TAO::Any_Array_Impl_T<T_slice, T_forany> ARRAY_ANY_IMPL;
-      ACE_NEW_RETURN (replacement,
-                      ARRAY_ANY_IMPL (destructor,
-                                      any_tc,
-                                      T_forany::tao_alloc ()),
-                      0);
-
-      auto_ptr<TAO::Any_Array_Impl_T<T_slice, T_forany> > replacement_safety (
-          replacement
-        );
-
-      // We know this will work since the unencoded case is covered above.  
-      TAO::Unknown_IDL_Type *unk =
-        dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-
-      // We don't want the rd_ptr of unk to move, in case it is
-      // shared by another Any. This copies the state, not the buffer.
-      TAO_InputCDR for_reading (unk->_tao_get_cdr ());
-
-      CORBA::Boolean good_decode =
-        replacement->demarshal_value (for_reading);
-
-      if (good_decode)
-        {
-          _tao_elem = reinterpret_cast <T_slice*> (replacement->value_);
-          const_cast<CORBA::Any &> (any).replace (replacement);
-          replacement_safety.release ();
-          return 1;
-        }
-
-      // Duplicated by Any_Impl base class constructor.
-      CORBA::release (any_tc);
-    }
-  ACE_CATCHANY
-    {
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-template<typename T_slice, typename T_forany>
-void
-TAO::Any_Array_Impl_T<T_slice, T_forany>::free_value (void)
-{
-  if (this->value_destructor_ != 0)
-    {
-      (*this->value_destructor_) (this->value_);
-      this->value_destructor_ = 0;
-    }
-
-  this->value_ = 0;
-  CORBA::release (this->type_);
-}
-
-template<typename T_slice, typename T_forany>
-void
-TAO::Any_Array_Impl_T<T_slice, T_forany>::_tao_decode (TAO_InputCDR &cdr
-                                                       ACE_ENV_ARG_DECL)
-{
-  if (! this->demarshal_value (cdr))
-    {
-      ACE_THROW (CORBA::MARSHAL ());
-    }
-}
-
-#endif /* TAO_ANY_ARRAY_IMPL_T_C */
diff --git a/TAO/tao/Any_Array_Impl_T.h b/TAO/tao/Any_Array_Impl_T.h
deleted file mode 100644
index e594b6c2142..00000000000
--- a/TAO/tao/Any_Array_Impl_T.h
+++ /dev/null
@@ -1,85 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Any_Array_Impl_T.h
- *
- *  $Id$
- *
- *  @authors  Carlos O'Ryan and Jeff Parsons
- */
-//=============================================================================
-
-
-#ifndef TAO_ANY_ARRAY_IMPL_T_H
-#define TAO_ANY_ARRAY_IMPL_T_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Any_Impl.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  /**
-   * @class Any_Array_Impl_T
-   *
-   * @brief Template Any class for array types.
-   *
-   * Used for arrays
-   */
-  template<typename T_slice, typename T_forany>
-  class Any_Array_Impl_T : public Any_Impl
-  {
-  public:
-    Any_Array_Impl_T (_tao_destructor destructor,
-                      CORBA::TypeCode_ptr,
-                      T_slice * const);
-    virtual ~Any_Array_Impl_T (void);
-
-    static void insert (CORBA::Any &,
-                        _tao_destructor destructor,
-                        CORBA::TypeCode_ptr,
-                        T_slice * const);
-    static CORBA::Boolean extract (const CORBA::Any &,
-                                   _tao_destructor,
-                                   CORBA::TypeCode_ptr,
-                                   T_slice *&);
-
-    virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
-    CORBA::Boolean demarshal_value (TAO_InputCDR &);
-    virtual void _tao_decode (TAO_InputCDR &
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    virtual const void *value (void) const;
-    virtual void free_value (void);
-
-  private:
-    T_slice * value_;
-  };
-}
-
-#if defined (__ACE_INLINE__)
-# include "tao/Any_Array_Impl_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_Array_Impl_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Any_Array_Impl_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ANY_ARRAY_IMPL_T_H */
-
diff --git a/TAO/tao/Any_Array_Impl_T.inl b/TAO/tao/Any_Array_Impl_T.inl
deleted file mode 100644
index 876b658d0ae..00000000000
--- a/TAO/tao/Any_Array_Impl_T.inl
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-template<typename T_slice, typename T_forany>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Array_Impl_T<T_slice, T_forany>::marshal_value (TAO_OutputCDR &cdr)
-{
-  return (cdr << T_forany (this->value_));
-}
-
-template<typename T_slice, typename T_forany>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Array_Impl_T<T_slice, T_forany>::demarshal_value (TAO_InputCDR &cdr)
-{
-  T_forany tmp (this->value_);
-  return (cdr >> tmp);
-}
-
-template<typename T_slice, typename T_forany>
-ACE_INLINE
-const void *
-TAO::Any_Array_Impl_T<T_slice, T_forany>::value (void) const
-{
-  return this->value_;
-}
diff --git a/TAO/tao/Any_Basic_Impl.cpp b/TAO/tao/Any_Basic_Impl.cpp
deleted file mode 100644
index 3d333d66b8e..00000000000
--- a/TAO/tao/Any_Basic_Impl.cpp
+++ /dev/null
@@ -1,382 +0,0 @@
-// $Id$
-
-#include "tao/Any_Basic_Impl.h"
-#include "tao/Any_Unknown_IDL_Type.h"
-#include "tao/Any.h"
-#include "tao/TypeCode.h"
-#include "tao/CDR.h"
-#include "tao/SystemException.h"
-
-#include "ace/Auto_Ptr.h"
-#include "ace/OS_NS_string.h"
-
-ACE_RCSID (tao,
-           Any_Basic_Impl,
-           "$Id$")
-
-namespace TAO
-{
-  Any_Basic_Impl::Any_Basic_Impl (CORBA::TypeCode_ptr tc,
-                                  void *value)
-    : Any_Impl (0, tc),
-      kind_ (CORBA::tk_null)
-  {
-    ACE_DECLARE_NEW_CORBA_ENV;
-    this->kind_ = TAO::unaliased_kind (tc
-                                       ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-
-    switch (this->kind_)
-    {
-      case CORBA::tk_short:
-        this->u_.s = *static_cast<CORBA::Short *> (value);
-        break;
-      case CORBA::tk_ushort:
-        this->u_.us = *static_cast<CORBA::UShort *> (value);
-        break;
-      case CORBA::tk_long:
-        this->u_.l = *static_cast<CORBA::Long *> (value);
-        break;
-      case CORBA::tk_ulong:
-         this->u_.ul = *static_cast<CORBA::ULong *> (value);
-        break;
-      case CORBA::tk_float:
-        this->u_.f = *static_cast<CORBA::Float *> (value);
-        break;
-      case CORBA::tk_double:
-        this->u_.d = *static_cast<CORBA::Double *> (value);
-        break;
-      case CORBA::tk_boolean:
-        this->u_.b = *static_cast<CORBA::Boolean *> (value);
-        break;
-      case CORBA::tk_char:
-        this->u_.c = *static_cast<CORBA::Char *> (value);
-        break;
-      case CORBA::tk_octet:
-        this->u_.o = *static_cast<CORBA::Octet *> (value);
-        break;
-      case CORBA::tk_longlong:
-        this->u_.ll = *static_cast<CORBA::LongLong *> (value);
-        break;
-#if !defined (ACE_LACKS_LONGLONG_T)
-      case CORBA::tk_ulonglong:
-  #if !defined (ACE_LACKS_UNSIGNEDLONGLONG_T)
-        this->u_.ull = *static_cast<CORBA::ULongLong *> (value);
-  #else
-        this->u_.ull = *static_cast<CORBA::LongLong *> (value);
-  #endif
-        break;
-#endif
-      case CORBA::tk_longdouble:
-        this->u_.ld = *static_cast<CORBA::LongDouble *> (value);
-        break;
-      case CORBA::tk_wchar:
-        this->u_.wc = *static_cast<CORBA::WChar *> (value);
-        break;
-      default:
-        break;
-    }
-  }
-
-  Any_Basic_Impl::~Any_Basic_Impl (void)
-  {
-  }
-
-  void
-  Any_Basic_Impl::insert (CORBA::Any &any,
-                          CORBA::TypeCode_ptr tc,
-                          const void *value)
-  {
-    Any_Basic_Impl *new_impl = 0;
-    ACE_NEW (new_impl,
-             Any_Basic_Impl (tc,
-                             const_cast<void *> (value)));
-    any.replace (new_impl);
-  }
-
-  CORBA::Boolean
-  Any_Basic_Impl::extract (const CORBA::Any &any,
-                           CORBA::TypeCode_ptr tc,
-                           void *_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 ();
-
-        if (!impl->encoded ())
-          {
-            TAO::Any_Basic_Impl *narrow_impl =
-              dynamic_cast<TAO::Any_Basic_Impl *> (impl);
-
-            if (narrow_impl == 0)
-              {
-                return 0;
-              }
-
-            Any_Basic_Impl::assign_value (_tao_elem,
-                                          narrow_impl);
-            return 1;
-          }
-
-        TAO::Any_Basic_Impl *replacement =
-          TAO::Any_Basic_Impl::create_empty (any_tc);
-
-        auto_ptr<TAO::Any_Basic_Impl> replacement_safety (replacement);
-
-        // We know this will work since the unencoded case is covered above.
-        TAO::Unknown_IDL_Type *unk =
-          dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-
-        // Get the kind of the type where we are extracting in ie. the
-        // aliased  type if there are any. Passing the aliased kind
-        // will not help.
-        CORBA::TCKind const tck = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        // We don't want the rd_ptr of unk to move, in case it is
-        // shared by another Any. This copies the state, not the buffer.
-        TAO_InputCDR for_reading (unk->_tao_get_cdr ());
-
-        CORBA::Boolean good_decode =
-          replacement->demarshal_value (for_reading,
-                                        static_cast<CORBA::Long> (tck));
-
-        if (good_decode)
-          {
-            Any_Basic_Impl::assign_value (_tao_elem,
-                                          replacement,
-                                          tck);
-            const_cast<CORBA::Any &> (any).replace (replacement);
-            replacement_safety.release ();
-            return 1;
-          }
-
-        // Duplicated by Any_Impl base class constructor.
-        CORBA::release (any_tc);
-      }
-    ACE_CATCHANY
-      {
-      }
-    ACE_ENDTRY;
-
-    return 0;
-  }
-
-  CORBA::Boolean
-  Any_Basic_Impl::marshal_value (TAO_OutputCDR &cdr)
-  {
-    CORBA::TCKind tckind = static_cast<CORBA::TCKind> (this->kind_);
-
-    switch (tckind)
-    {
-      case CORBA::tk_short:
-        return cdr << this->u_.s;
-      case CORBA::tk_ushort:
-        return cdr << this->u_.us;
-      case CORBA::tk_long:
-        return cdr << this->u_.l;
-      case CORBA::tk_ulong:
-        return cdr << this->u_.ul;
-      case CORBA::tk_float:
-        return cdr << this->u_.f;
-      case CORBA::tk_double:
-        return cdr << this->u_.d;
-      case CORBA::tk_boolean:
-        return cdr << CORBA::Any::from_boolean (this->u_.b);
-      case CORBA::tk_char:
-        return cdr << CORBA::Any::from_char (this->u_.c);
-      case CORBA::tk_octet:
-        return cdr << CORBA::Any::from_octet (this->u_.o);
-      case CORBA::tk_longlong:
-        return cdr << this->u_.ll;
-#if !defined (ACE_LACKS_LONGLONG_T)
-      case CORBA::tk_ulonglong:
-        return cdr << this->u_.ull;
-#endif
-      case CORBA::tk_longdouble:
-        return cdr << this->u_.ld;
-      case CORBA::tk_wchar:
-        return cdr << CORBA::Any::from_wchar (this->u_.wc);
-      default:
-        return 0;
-    }
-  }
-
-  CORBA::Boolean
-  Any_Basic_Impl::demarshal_value (TAO_InputCDR &cdr)
-  {
-    return this->demarshal_value (cdr,
-                                  this->kind_);
-  }
-
-  CORBA::Boolean
-  Any_Basic_Impl::demarshal_value (TAO_InputCDR &cdr,
-                                   CORBA::Long tck)
-  {
-    CORBA::TCKind const tckind = static_cast<CORBA::TCKind> (tck);
-    switch (tckind)
-    {
-      case CORBA::tk_short:
-        return cdr >> this->u_.s;
-      case CORBA::tk_ushort:
-        return cdr >> this->u_.us;
-      case CORBA::tk_long:
-        return cdr >> this->u_.l;
-      case CORBA::tk_ulong:
-        return cdr >> this->u_.ul;
-      case CORBA::tk_float:
-        return cdr >> this->u_.f;
-      case CORBA::tk_double:
-        return cdr >> this->u_.d;
-      case CORBA::tk_boolean:
-        return cdr >> CORBA::Any::to_boolean (this->u_.b);
-      case CORBA::tk_char:
-        return cdr >> CORBA::Any::to_char (this->u_.c);
-      case CORBA::tk_octet:
-        return cdr >> CORBA::Any::to_octet (this->u_.o);
-      case CORBA::tk_longlong:
-        return cdr >> this->u_.ll;
-#if !defined (ACE_LACKS_LONGLONG_T)
-      case CORBA::tk_ulonglong:
-        return cdr >> this->u_.ull;
-#endif
-      case CORBA::tk_longdouble:
-        return cdr >> this->u_.ld;
-      case CORBA::tk_wchar:
-        return cdr >> CORBA::Any::to_wchar (this->u_.wc);
-      default:
-        return 0;
-    }
-  }
-
-  void
-  Any_Basic_Impl::_tao_decode (TAO_InputCDR &cdr
-                               ACE_ENV_ARG_DECL)
-  {
-    if (! this->demarshal_value (cdr))
-      {
-        ACE_THROW (CORBA::MARSHAL ());
-      }
-  }
-
-  Any_Basic_Impl *
-  Any_Basic_Impl::create_empty (CORBA::TypeCode_ptr tc)
-  {
-    ACE_DECLARE_NEW_CORBA_ENV;
-    CORBA::TCKind const kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
-
-    TAO::Any_Basic_Impl * retval = 0;
-
-    switch (kind)
-    {
-      case CORBA::tk_longlong:
-        {
-          CORBA::LongLong tmp = ACE_CDR_LONGLONG_INITIALIZER;
-          ACE_NEW_RETURN (retval,
-                          TAO::Any_Basic_Impl (tc, &tmp),
-                          0);
-        }
-
-        break;
-      case CORBA::tk_longdouble:
-        {
-          CORBA::LongDouble tmp = ACE_CDR_LONG_DOUBLE_INITIALIZER;
-          ACE_NEW_RETURN (retval,
-                          TAO::Any_Basic_Impl (tc, &tmp),
-                          0);
-        }
-
-        break;
-      default:
-        {
-          CORBA::ULongLong tmp = 0;
-          ACE_NEW_RETURN (retval,
-                          TAO::Any_Basic_Impl (tc, &tmp),
-                          0);
-        }
-
-        break;
-    }
-
-    return retval;
-  }
-
-  void
-  Any_Basic_Impl::assign_value (void *dest, Any_Basic_Impl *src)
-  {
-    Any_Basic_Impl::assign_value (dest,
-                                  src,
-                                  src->kind_);
-  }
-
-  void
-  Any_Basic_Impl::assign_value (void *dest,
-                                Any_Basic_Impl *src,
-                                CORBA::Long tck)
-  {
-    CORBA::TCKind const kind = static_cast<CORBA::TCKind> (tck);
-
-    switch (kind)
-      {
-      case CORBA::tk_short:
-        *static_cast<CORBA::Short *> (dest) = src->u_.s;
-        break;
-      case CORBA::tk_ushort:
-        *static_cast<CORBA::UShort *> (dest) = src->u_.us;
-        break;
-      case CORBA::tk_long:
-        *static_cast<CORBA::Long *> (dest) = src->u_.l;
-        break;
-      case CORBA::tk_ulong:
-        *static_cast<CORBA::ULong *> (dest) = src->u_.ul;
-        break;
-      case CORBA::tk_float:
-        *static_cast<CORBA::Float *> (dest) = src->u_.f;
-        break;
-      case CORBA::tk_double:
-        *static_cast<CORBA::Double *> (dest) = src->u_.d;
-        break;
-      case CORBA::tk_boolean:
-        *static_cast<CORBA::Boolean *> (dest) = src->u_.b;
-        break;
-      case CORBA::tk_char:
-        *static_cast<CORBA::Char *> (dest) = src->u_.c;
-        break;
-      case CORBA::tk_octet:
-        *static_cast<CORBA::Octet *> (dest) = src->u_.o;
-        break;
-      case CORBA::tk_longlong:
-        *static_cast<CORBA::LongLong *> (dest) = src->u_.ll;
-        break;
-#if !defined (ACE_LACKS_LONGLONG_T)
-      case CORBA::tk_ulonglong:
-  #if !defined (ACE_LACKS_UNSIGNEDLONGLONG_T)
-        *static_cast<CORBA::ULongLong *> (dest) = src->u_.ull;
-        break;
-  #else
-        *static_cast<CORBA::LongLong *> (dest) = src->u_.ull;
-  #endif
-#endif
-      case CORBA::tk_longdouble:
-        *static_cast<CORBA::LongDouble *> (dest) = src->u_.ld;
-        break;
-      case CORBA::tk_wchar:
-        *static_cast<CORBA::WChar *> (dest) = src->u_.wc;
-        break;
-      default:
-        break;
-      }
-  }
-}
diff --git a/TAO/tao/Any_Basic_Impl.h b/TAO/tao/Any_Basic_Impl.h
deleted file mode 100644
index 600b11ef69a..00000000000
--- a/TAO/tao/Any_Basic_Impl.h
+++ /dev/null
@@ -1,97 +0,0 @@
-// -*- C++ -*-
-//=============================================================================
-/**
- *  @file    Any_Basic_Impl.h
- *
- *  $Id$
- *
- *  @authors  Carlos O'Ryan and Jeff Parsons
- */
-//=============================================================================
-
-#ifndef TAO_ANY_BASIC_IMPL_H
-#define TAO_ANY_BASIC_IMPL_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Any_Impl.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace CORBA
-{
-  class Any;
-}
-
-namespace TAO
-{
-  /**
-   * @class Any_Basic_Impl
-   *
-   * @brief Non-template class for all the basic types.
-   *
-   */
-  class TAO_Export Any_Basic_Impl : public Any_Impl
-  {
-  public:
-    Any_Basic_Impl (CORBA::TypeCode_ptr,
-                    void *value);
-
-    virtual ~Any_Basic_Impl (void);
-
-    static void insert (CORBA::Any &,
-                        CORBA::TypeCode_ptr,
-                        const void *);
-    static CORBA::Boolean extract (const CORBA::Any &,
-                                   CORBA::TypeCode_ptr,
-                                   void *);
-
-    virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
-
-    CORBA::Boolean demarshal_value (TAO_InputCDR &);
-    CORBA::Boolean demarshal_value (TAO_InputCDR &,
-                                    CORBA::Long);
-
-    virtual void _tao_decode (TAO_InputCDR &
-                              ACE_ENV_ARG_DECL);
-
-    static Any_Basic_Impl *create_empty (CORBA::TypeCode_ptr);
-
-  private:
-    static void assign_value (void *, Any_Basic_Impl *);
-
-    static void assign_value (void *,
-                              Any_Basic_Impl *,
-                              CORBA::Long tck);
-  private:
-    CORBA::Long kind_;
-    union
-    {
-      CORBA::Short s;
-      CORBA::UShort us;
-      CORBA::Long l;
-      CORBA::ULong ul;
-      CORBA::Float f;
-      CORBA::Double d;
-      CORBA::Boolean b;
-      CORBA::Char c;
-      CORBA::Octet o;
-      CORBA::LongLong ll;
-#if !defined (ACE_LACKS_LONGLONG_T) && !defined (ACE_LACKS_UNSIGNEDLONGLONG_T)
-      CORBA::ULongLong ull;
-#elif defined (ACE_LACKS_UNSIGNEDLONGLONG_T)
-      // Platform has signed long long but not unsigned long long.
-      // Use signed long long as the container.
-      CORBA::LongLong ull;
-#endif
-      CORBA::LongDouble ld;
-      CORBA::WChar wc;
-    }u_;
-  };
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ANY_BASIC_IMPL_H */
diff --git a/TAO/tao/Any_Basic_Impl_T.cpp b/TAO/tao/Any_Basic_Impl_T.cpp
deleted file mode 100644
index 79bb6a1896b..00000000000
--- a/TAO/tao/Any_Basic_Impl_T.cpp
+++ /dev/null
@@ -1,144 +0,0 @@
-// $Id$
-
-#ifndef TAO_ANY_BASIC_IMPL_T_C
-#define TAO_ANY_BASIC_IMPL_T_C
-
-#include "tao/Any_Basic_Impl_T.h"
-#include "tao/Any_Unknown_IDL_Type.h"
-#include "tao/Marshal.h"
-#include "tao/Environment.h"
-#include "tao/SystemException.h"
-#include "tao/CDR.h"
-
-#include "ace/CORBA_macros.h"
-#include "ace/Auto_Ptr.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Any_Basic_Impl_T.inl"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           Any_Basic_Impl_T,
-           "$Id$")
-
-
-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 ();
-
-      if (!impl->encoded ())
-        {
-          TAO::Any_Basic_Impl_T<T> *narrow_impl =
-            dynamic_cast <TAO::Any_Basic_Impl_T<T> *> (impl);
-
-          if (narrow_impl == 0)
-            {
-              return 0;
-            }
-
-          _tao_elem = narrow_impl->value_;
-          return 1;
-        }
-
-      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);
-
-      // We know this will work since the unencoded case is covered above.  
-      TAO::Unknown_IDL_Type *unk =
-        dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-
-      // We don't want the rd_ptr of unk to move, in case it is
-      // shared by another Any. This copies the state, not the buffer.
-      TAO_InputCDR for_reading (unk->_tao_get_cdr ());
-
-      CORBA::Boolean good_decode =
-        replacement->demarshal_value (for_reading);
-
-      if (good_decode)
-        {
-          _tao_elem = replacement->value_;
-          const_cast<CORBA::Any &> (any).replace (replacement);
-          replacement_safety.release ();
-          return 1;
-        }
-
-      // Duplicated by Any_Impl base class constructor.
-      CORBA::release (any_tc);
-    }
-  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,
-                                            static_cast<T> (0)),
-                  0);
-  return retval;
-}
-
-template<typename T>
-void
-TAO::Any_Basic_Impl_T<T>::_tao_decode (TAO_InputCDR &cdr
-                                       ACE_ENV_ARG_DECL)
-{
-  if (! this->demarshal_value (cdr))
-    {
-      ACE_THROW (CORBA::MARSHAL ());
-    }
-}
-
-#endif /* TAO_ANY_BASIC_IMPL_T_C */
diff --git a/TAO/tao/Any_Basic_Impl_T.h b/TAO/tao/Any_Basic_Impl_T.h
deleted file mode 100644
index 7c9c3f697c1..00000000000
--- a/TAO/tao/Any_Basic_Impl_T.h
+++ /dev/null
@@ -1,82 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Any_Basic_Impl_T.h
- *
- *  $Id$
- *
- *  @authors  Carlos O'Ryan and Jeff Parsons
- */
-//=============================================================================
-
-
-#ifndef TAO_ANY_BASIC_IMPL_T_H
-#define TAO_ANY_BASIC_IMPL_T_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Any_Impl.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  /**
-   * @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 void _tao_decode (TAO_InputCDR &
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    virtual const void *value (void) const;
-    static Any_Basic_Impl_T<T> *create_empty (CORBA::TypeCode_ptr);
-
-  private:
-    T value_;
-  };
-}
-
-#if defined (__ACE_INLINE__)
-# include "tao/Any_Basic_Impl_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_Basic_Impl_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Any_Basic_Impl_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ANY_BASIC_IMPL_T_H */
-
diff --git a/TAO/tao/Any_Basic_Impl_T.inl b/TAO/tao/Any_Basic_Impl_T.inl
deleted file mode 100644
index 4250b5f4f88..00000000000
--- a/TAO/tao/Any_Basic_Impl_T.inl
+++ /dev/null
@@ -1,26 +0,0 @@
-// $Id$
-
-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_;
-}
-
diff --git a/TAO/tao/Any_Dual_Impl_T.cpp b/TAO/tao/Any_Dual_Impl_T.cpp
deleted file mode 100644
index 30bc144035c..00000000000
--- a/TAO/tao/Any_Dual_Impl_T.cpp
+++ /dev/null
@@ -1,202 +0,0 @@
-// $Id$
-
-#ifndef TAO_ANY_DUAL_IMPL_T_CPP
-#define TAO_ANY_DUAL_IMPL_T_CPP
-
-#include "tao/Any_Dual_Impl_T.h"
-#include "tao/Any.h"
-#include "tao/Any_Unknown_IDL_Type.h"
-#include "tao/Marshal.h"
-#include "tao/CORBA_String.h"
-#include "tao/Environment.h"
-#include "tao/SystemException.h"
-#include "tao/CDR.h"
-#include "tao/TypeCode.h"
-
-#include "ace/CORBA_macros.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/OS_Memory.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Any_Dual_Impl_T.inl"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           Any_Dual_Impl_T,
-           "$Id$")
-
-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> void
-TAO::Any_Dual_Impl_T<T>::value (const T & val)
-{
-  ACE_NEW (this->value_,
-           T (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 (destructor,
-              tc)
-{
-  this->value (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 ();
-
-      if (!impl->encoded ())
-        {
-          TAO::Any_Dual_Impl_T<T> *narrow_impl =
-            dynamic_cast <TAO::Any_Dual_Impl_T<T> *> (impl);
-
-          if (narrow_impl == 0)
-            {
-              return 0;
-            }
-
-          _tao_elem = narrow_impl->value_;
-          return 1;
-        }
-
-      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);
-
-      // We know this will work since the unencoded case is covered above.  
-      TAO::Unknown_IDL_Type *unk =
-        dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-
-      // We don't want the rd_ptr of unk to move, in case it is
-      // shared by another Any. This copies the state, not the buffer.
-      TAO_InputCDR for_reading (unk->_tao_get_cdr ());
-
-      CORBA::Boolean good_decode =
-        replacement->demarshal_value (for_reading);
-
-      if (good_decode)
-        {
-          _tao_elem = replacement->value_;
-          const_cast<CORBA::Any &> (any).replace (replacement);
-          replacement_safety.release ();
-          return 1;
-        }
-
-      // Duplicated by Any_Impl base class constructor.
-      CORBA::release (any_tc);
-    }
-  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;
-    }
-
-  CORBA::release (this->type_);
-  this->value_ = 0;
-}
-
-template<typename T>
-void
-TAO::Any_Dual_Impl_T<T>::_tao_decode (TAO_InputCDR &cdr
-                                      ACE_ENV_ARG_DECL)
-{
-  if (! this->demarshal_value (cdr))
-    {
-      ACE_THROW (CORBA::MARSHAL ());
-    }
-}
-
-#endif /* TAO_ANY_DUAL_IMPL_T_CPP */
diff --git a/TAO/tao/Any_Dual_Impl_T.h b/TAO/tao/Any_Dual_Impl_T.h
deleted file mode 100644
index 18cec8ec7b6..00000000000
--- a/TAO/tao/Any_Dual_Impl_T.h
+++ /dev/null
@@ -1,97 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Any_Dual_Impl_T.h
- *
- *  $Id$
- *
- *  @authors  Carlos O'Ryan and Jeff Parsons
- */
-//=============================================================================
-
-
-#ifndef TAO_ANY_DUAL_IMPL_T_H
-#define TAO_ANY_DUAL_IMPL_T_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Any_Impl.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  /**
-   * @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 void _tao_decode (TAO_InputCDR &
-                              ACE_ENV_ARG_DECL);
-
-    virtual const void *value (void) const;
-    virtual void free_value (void);
-
-  protected:
-    void value (const T &);
-
-    T * value_;
-  };
-}
-
-#if defined (__ACE_INLINE__)
-# include "tao/Any_Dual_Impl_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_Dual_Impl_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Any_Dual_Impl_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ANY_DUAL_IMPL_T_H */
-
diff --git a/TAO/tao/Any_Dual_Impl_T.inl b/TAO/tao/Any_Dual_Impl_T.inl
deleted file mode 100644
index bf3ecd90e33..00000000000
--- a/TAO/tao/Any_Dual_Impl_T.inl
+++ /dev/null
@@ -1,26 +0,0 @@
-// $Id$
-
-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/Any_Impl.cpp b/TAO/tao/Any_Impl.cpp
deleted file mode 100644
index 7d9586241e0..00000000000
--- a/TAO/tao/Any_Impl.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-// $Id$
-
-#include "Any_Impl.h"
-#include "Marshal.h"
-#include "CORBA_String.h"
-#include "SystemException.h"
-#include "TypeCode.h"
-
-
-#include "ace/Guard_T.h"
-
-
-ACE_RCSID (tao,
-           Any_Impl,
-           "$Id$")
-
-
-TAO::Any_Impl::Any_Impl (_tao_destructor destructor,
-                         CORBA::TypeCode_ptr tc,
-                         bool encoded)
-  : value_destructor_ (destructor)
-  , type_ (CORBA::TypeCode::_duplicate (tc))
-  , encoded_ (encoded)
-  , refcount_ (1)
-{
-}
-
-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);
-}
-
-// Deprecated by the OMG.
-const void *
-TAO::Any_Impl::value (void) const
-{
-  return 0;
-}
-
-void
-TAO::Any_Impl::free_value (void)
-{
-  // We always have to do this.
-  CORBA::release (this->type_);
-}
-
-CORBA::TypeCode_ptr
-TAO::Any_Impl::type (void) const
-{
-  return CORBA::TypeCode::_duplicate (this->type_);
-}
-
-CORBA::TypeCode_ptr
-TAO::Any_Impl::_tao_get_typecode (void) const
-{
-  return this->type_;
-}
-
-void
-TAO::Any_Impl::type (CORBA::TypeCode_ptr tc)
-{
-  CORBA::release (this->type_);
-  this->type_ = CORBA::TypeCode::_duplicate (tc);
-}
-
-int
-TAO::Any_Impl::_tao_byte_order (void) const
-{
-  return TAO_ENCAP_BYTE_ORDER;
-}
-
-void
-TAO::Any_Impl::_tao_any_string_destructor (void *x)
-{
-  char *tmp = static_cast<char *> (x);
-  CORBA::string_free (tmp);
-}
-
-void
-TAO::Any_Impl::_tao_any_wstring_destructor (void *x)
-{
-  CORBA::WChar *tmp = static_cast<CORBA::WChar *> (x);
-  CORBA::wstring_free (tmp);
-}
-
-void
-TAO::Any_Impl::_add_ref (void)
-{
-  ++this->refcount_;
-}
-
-void
-TAO::Any_Impl::_remove_ref (void)
-{
-  const CORBA::ULong new_count = --this->refcount_;
-
-  if (new_count != 0)
-    return;
-
-  this->free_value ();
-
-  delete this;
-}
-
-void
-TAO::Any_Impl::_tao_decode (TAO_InputCDR &
-                            ACE_ENV_ARG_DECL)
-{
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
-}
-
-CORBA::Boolean
-TAO::Any_Impl::to_object (CORBA::Object_ptr &) const
-{
-  return 0;
-}
-
-CORBA::Boolean
-TAO::Any_Impl::to_value (CORBA::ValueBase *&) const
-{
-  return 0;
-}
-
-CORBA::Boolean
-TAO::Any_Impl::to_abstract_base (CORBA::AbstractBase_ptr &) const
-{
-  return 0;
-}
-
-bool
-TAO::Any_Impl::encoded (void) const
-{
-  return this->encoded_;
-}
-
diff --git a/TAO/tao/Any_Impl.h b/TAO/tao/Any_Impl.h
deleted file mode 100644
index f3365631728..00000000000
--- a/TAO/tao/Any_Impl.h
+++ /dev/null
@@ -1,117 +0,0 @@
-// -*- C++ -*-
-//=============================================================================
-/**
- *  @file    Any_Impl.h
- *
- *  $Id$
- *
- *  @authors  Carlos O'Ryan and Jeff Parsons
- */
-//=============================================================================
-
-#ifndef TAO_ANY_IMPL_H
-#define TAO_ANY_IMPL_H
-
-#include /**/ "ace/pre.h"
-#include "ace/CORBA_macros.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Basic_Types.h"
-#include "tao/TAO_Export.h"
-#include "tao/orbconf.h"
-#include "ace/Synch_Traits.h"
-#include "ace/Null_Mutex.h"
-#include "ace/Thread_Mutex.h"
-#include "ace/Atomic_Op.h"
-
-class TAO_OutputCDR;
-class TAO_InputCDR;
-class ACE_Message_Block;
-
-namespace CORBA
-{
-  class TypeCode;
-  typedef TypeCode *TypeCode_ptr;
-
-  class Object;
-  typedef Object *Object_ptr;
-
-  class ValueBase;
-  class AbstractBase;
-  typedef AbstractBase *AbstractBase_ptr;
-
-  class Environment;
-}
-
-namespace TAO
-{
-  /**
-   * @class Any_Impl
-   *
-   * @brief Base class for the Any 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 *);
-
-    CORBA::Boolean marshal (TAO_OutputCDR &);
-    virtual CORBA::Boolean marshal_value (TAO_OutputCDR &) = 0;
-
-    /// @deprecated
-    /// Deprecated by the OMG. This no longer appears in
-    /// the C++ mapping. It is here only for backward
-    /// compatibility. It is no longer (as of 5/26/04)
-    /// used anywhere in TAO.
-    virtual const void *value (void) const;
-
-    virtual void free_value (void);
-
-    CORBA::TypeCode_ptr type (void) const;
-    CORBA::TypeCode_ptr _tao_get_typecode (void) const;
-    void type (CORBA::TypeCode_ptr);
-
-    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 *);
-
-    virtual void _tao_decode (TAO_InputCDR &
-                              ACE_ENV_ARG_DECL);
-
-    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;
-
-    bool encoded (void) const;
-
-  protected:
-    Any_Impl (_tao_destructor,
-              CORBA::TypeCode_ptr,
-              bool encoded = false);
-    virtual ~Any_Impl (void);
-
-    TAO::Any_Impl::_tao_destructor value_destructor_;
-    CORBA::TypeCode_ptr type_;
-    bool encoded_;
-
-  private:
-    /// Reference counter.
-    ACE_Atomic_Op<TAO_SYNCH_MUTEX, CORBA::ULong> refcount_;
-  };
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ANY_IMPL_H */
diff --git a/TAO/tao/Any_Impl_T.cpp b/TAO/tao/Any_Impl_T.cpp
deleted file mode 100644
index 5a06163cfa5..00000000000
--- a/TAO/tao/Any_Impl_T.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-// $Id$
-
-#ifndef TAO_ANY_IMPL_T_C
-#define TAO_ANY_IMPL_T_C
-
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Unknown_IDL_Type.h"
-#include "tao/Marshal.h"
-#include "tao/CDR.h"
-#include "tao/Environment.h"
-#include "tao/SystemException.h"
-#include "tao/TypeCode.h"
-
-#include "ace/CORBA_macros.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/OS_Memory.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Any_Impl_T.inl"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           Any_Impl_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 ();
-
-      if (!impl->encoded ())
-        {
-          TAO::Any_Impl_T<T> *narrow_impl =
-            dynamic_cast <TAO::Any_Impl_T<T> *> (impl);
-
-          if (narrow_impl == 0)
-            {
-              return 0;
-            }
-
-          _tao_elem = (T *) narrow_impl->value_;
-          return 1;
-        }
-
-      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);
-
-      // We know this will work since the unencoded case is covered above.  
-      TAO::Unknown_IDL_Type *unk =
-        dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-
-      // We don't want the rd_ptr of unk to move, in case it is
-      // shared by another Any. This copies the state, not the buffer.
-      TAO_InputCDR for_reading (unk->_tao_get_cdr ());
-
-      CORBA::Boolean good_decode =
-        replacement->demarshal_value (for_reading);
-
-      if (good_decode)
-        {
-          _tao_elem = const_cast<T *> (replacement->value_);
-          const_cast<CORBA::Any &> (any).replace (replacement);
-          replacement_safety.release ();
-          return 1;
-        }
-
-      // Duplicated by Any_Impl base class constructor.
-      CORBA::release (any_tc);
-    }
-  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;
-    }
-
-  CORBA::release (this->type_);
-  this->value_ = 0;
-}
-
-template<typename T>
-void
-TAO::Any_Impl_T<T>::_tao_decode (TAO_InputCDR &cdr
-                                 ACE_ENV_ARG_DECL)
-{
-  if (! this->demarshal_value (cdr))
-    {
-      ACE_THROW (CORBA::MARSHAL ());
-    }
-}
-
-#endif /* TAO_ANY_IMPL_T_C */
diff --git a/TAO/tao/Any_Impl_T.h b/TAO/tao/Any_Impl_T.h
deleted file mode 100644
index ab715e94303..00000000000
--- a/TAO/tao/Any_Impl_T.h
+++ /dev/null
@@ -1,92 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Any_Impl_T.h
- *
- *  $Id$
- *
- *  @authors  Carlos O'Ryan and Jeff Parsons
- */
-//=============================================================================
-
-
-#ifndef TAO_ANY_IMPL_T_H
-#define TAO_ANY_IMPL_T_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Any_Impl.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace CORBA
-{
-  class Any;
-  class Environment;
-}
-
-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 void _tao_decode (TAO_InputCDR &  ACE_ENV_ARG_DECL);
-    virtual const void *value (void) const;
-    virtual void free_value (void);
-
-  private:
-    T * value_;
-  };
-}
-
-#if defined (__ACE_INLINE__)
-# include "tao/Any_Impl_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_Impl_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Any_Impl_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ANY_IMPL_T_H */
diff --git a/TAO/tao/Any_Impl_T.inl b/TAO/tao/Any_Impl_T.inl
deleted file mode 100644
index 1bbeebeea78..00000000000
--- a/TAO/tao/Any_Impl_T.inl
+++ /dev/null
@@ -1,53 +0,0 @@
-// 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_;
-}
-
diff --git a/TAO/tao/Any_Insert_Policy_T.h b/TAO/tao/Any_Insert_Policy_T.h
new file mode 100644
index 00000000000..d2a695673bd
--- /dev/null
+++ b/TAO/tao/Any_Insert_Policy_T.h
@@ -0,0 +1,109 @@
+// This may look like C, but it's really -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    Any_Insert_Policy_T.h
+ *
+ *  $Id$
+ *
+ *  @author Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_ANY_INSERT_POLICY_H
+#define TAO_ANY_INSERT_POLICY_H
+
+#include /**/ "ace/pre.h"
+
+#include "tao/UB_String_Argument_T.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/Arg_Traits_T.h"
+#include "tao/Argument.h"
+#include "tao/AnyTypeCode_Adapter.h"
+
+#include "ace/Dynamic_Service.h"
+#include "tao/debug.h"
+#include "tao/IFR_Client_Adapter.h"
+
+namespace TAO
+{
+  template <typename S>
+  class Any_Insert_Policy_Stream
+  {
+    public:
+      virtual void any_insert (CORBA::Any* p, S const & x) const
+      {
+        (*p) <<= x;
+      }
+  };
+
+  template <typename S>
+  class Any_Insert_Policy_AnyTypeCode_Adapter
+  {
+    public:
+      virtual void any_insert (CORBA::Any* p, S const & x) const
+      {
+        TAO_AnyTypeCode_Adapter *adapter =
+          ACE_Dynamic_Service<TAO_AnyTypeCode_Adapter>::instance (
+              "AnyTypeCode_Adapter"
+          );
+
+        if (adapter)
+          {
+            adapter->insert_into_any (p, x);
+          }
+        else
+          {
+            ACE_ERROR ((LM_ERROR,
+                        ACE_TEXT ("(%P|%t) %p\n"),
+                        ACE_TEXT ("ERROR: unable to find AnyTypeCode Adapter ")));
+          }
+      }
+  };
+
+  template <typename S>
+  class Any_Insert_Policy_IFR_Client_Adapter
+  {
+    public:
+      virtual void any_insert (CORBA::Any* p, S const & x) const
+      {
+        TAO_IFR_Client_Adapter *adapter =
+          ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
+              TAO_ORB_Core::ifr_client_adapter_name ()
+            );
+
+        adapter->interfacedef_any_insert (p, x);
+      }
+  };
+
+  template <typename S>
+  class Any_Insert_Policy_Noop
+  {
+    public:
+      virtual void any_insert (CORBA::Any* , S const &) const
+      {
+      }
+  };
+
+  template <typename S>
+  class Any_Insert_Policy_CORBA_Object
+  {
+    public:
+      virtual void any_insert (CORBA::Any* , S const &) const
+      {
+        if (TAO_debug_level > 2)
+          {
+            ACE_DEBUG ((LM_DEBUG,
+                        "TAO (%P|%t) - Cannot insert a vanilla CORBA Object"
+                        " into an Any for returning the return argument \n"));
+          }
+      }
+  };
+}
+
+#include /**/ "ace/post.h"
+#endif /* TAO_ANY_INSERT_POLICY_H */
diff --git a/TAO/tao/Any_Special_Impl_T.cpp b/TAO/tao/Any_Special_Impl_T.cpp
deleted file mode 100644
index 949300f4f12..00000000000
--- a/TAO/tao/Any_Special_Impl_T.cpp
+++ /dev/null
@@ -1,208 +0,0 @@
-// $Id$
-
-#ifndef TAO_ANY_SPECIAL_IMPL_T_C
-#define TAO_ANY_SPECIAL_IMPL_T_C
-
-#include "tao/Any_Special_Impl_T.h"
-#include "tao/Any_Unknown_IDL_Type.h"
-#include "tao/Marshal.h"
-#include "tao/Environment.h"
-#include "tao/String_TypeCode_Traits.h"
-
-#include "ace/CORBA_macros.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Any_Special_Impl_T.inl"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           Any_Special_Impl_T,
-           "$Id$")
-
-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::TypeCode_ptr tc,
-                                                  T * const value,
-                                                  CORBA::ULong bound
-  )
-{
-  CORBA::TypeCode_var bounded_tc;
-
-  if (bound > 0)
-    {
-      ACE_DECLARE_NEW_CORBA_ENV;
-      CORBA::TCKind const kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      bounded_tc =
-        TAO::TypeCodeFactory::String_Traits<from_T>::create_typecode (kind,
-                                                                      bound);
-    }
-  else
-    {
-      bounded_tc = CORBA::TypeCode::_duplicate (tc);
-    }
-
-  if (CORBA::is_nil (bounded_tc.in ()))
-    return;
-
-  Any_Special_Impl_T<T, from_T, to_T> * new_impl;
-  ACE_NEW (new_impl,
-           Any_Special_Impl_T (destructor,
-                               bounded_tc.in (),
-                               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::TypeCode_ptr tc,
-                                                   const T *& _tao_elem,
-                                                   CORBA::ULong bound
-  )
-{
-  _tao_elem = 0;
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::TypeCode_ptr any_type = any._tao_get_typecode ();
-      CORBA::TypeCode_var unaliased_any_type =
-        TAO::unaliased_typecode (any_type
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::TCKind any_kind =
-        unaliased_any_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::TCKind try_kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (any_kind != try_kind)
-        {
-          return 0;
-        }
-
-      CORBA::ULong length =
-        unaliased_any_type->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (length != bound)
-        {
-          return 0;
-        }
-
-      TAO::Any_Impl *impl = any.impl ();
-
-      typedef TAO::Any_Special_Impl_T<T, from_T, to_T>
-        BOUNDED_TSTRING_ANY_IMPL;
-
-      if (!impl->encoded ())
-        {
-          TAO::Any_Special_Impl_T<T, from_T, to_T> *narrow_impl =
-            dynamic_cast <BOUNDED_TSTRING_ANY_IMPL *> (impl);
-
-          if (narrow_impl == 0)
-            {
-              return 0;
-            }
-
-          _tao_elem = (T *) narrow_impl->value_;
-          return 1;
-        }
-
-      TAO::Any_Special_Impl_T<T, from_T, to_T> *replacement = 0;
-      ACE_NEW_RETURN (replacement,
-                      BOUNDED_TSTRING_ANY_IMPL (destructor,
-                                                tc,
-                                                0,
-                                                bound),
-                      0);
-
-      auto_ptr<TAO::Any_Special_Impl_T<T, from_T, to_T> > replacement_safety (
-          replacement
-        );
-
-      // We know this will work since the unencoded case is covered above.
-      TAO::Unknown_IDL_Type *unk =
-        dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-
-      // We don't want the rd_ptr of unk to move, in case it is
-      // shared by another Any. This copies the state, not the buffer.
-      TAO_InputCDR for_reading (unk->_tao_get_cdr ());
-
-      CORBA::Boolean good_decode =
-        replacement->demarshal_value (for_reading);
-
-      if (good_decode)
-        {
-          _tao_elem = replacement->value_;
-          const_cast<CORBA::Any &> (any).replace (replacement);
-          replacement_safety.release ();
-          return 1;
-        }
-
-      // Duplicated by Any_Impl base class constructor.
-      CORBA::release (tc);
-    }
-  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->value_ = 0;
-}
-
-template<typename T, typename from_T, typename to_T>
-void
-TAO::Any_Special_Impl_T<T, from_T, to_T>::_tao_decode (
-    TAO_InputCDR &cdr
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (! this->demarshal_value (cdr))
-    {
-      ACE_THROW (CORBA::MARSHAL ());
-    }
-}
-
-#endif /* TAO_ANY_T_C */
diff --git a/TAO/tao/Any_Special_Impl_T.h b/TAO/tao/Any_Special_Impl_T.h
deleted file mode 100644
index 3760521a480..00000000000
--- a/TAO/tao/Any_Special_Impl_T.h
+++ /dev/null
@@ -1,87 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Any_Special_Impl_T.h
- *
- *  $Id$
- *
- *  @author  Carlos O'Ryan and Jeff Parsons
- */
-//=============================================================================
-
-
-#ifndef TAO_ANY_SPECIAL_IMPL_T_H
-#define TAO_ANY_SPECIAL_IMPL_T_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Any_Impl.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  /**
-   * @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 bound);
-    virtual ~Any_Special_Impl_T (void);
-
-    static void insert (CORBA::Any &,
-                        _tao_destructor destructor,
-                        CORBA::TypeCode_ptr,
-                        T * const,
-                        CORBA::ULong bound);
-    static CORBA::Boolean extract (const CORBA::Any &,
-                                   _tao_destructor,
-                                   CORBA::TypeCode_ptr,
-                                   const T *&,
-                                   CORBA::ULong bound);
-
-    virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
-    CORBA::Boolean demarshal_value (TAO_InputCDR &);
-    virtual void _tao_decode (TAO_InputCDR &
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    virtual const void *value (void) const;
-    virtual void free_value (void);
-
-  private:
-    T * value_;
-    CORBA::ULong bound_;
-  };
-}
-
-#if defined (__ACE_INLINE__)
-# include "tao/Any_Special_Impl_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_Special_Impl_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Any_Special_Impl_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ANY_SPECIAL_IMPL_T_H */
-
diff --git a/TAO/tao/Any_Special_Impl_T.inl b/TAO/tao/Any_Special_Impl_T.inl
deleted file mode 100644
index bc8715b083f..00000000000
--- a/TAO/tao/Any_Special_Impl_T.inl
+++ /dev/null
@@ -1,30 +0,0 @@
-// $Id$
-
-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_;
-}
-
diff --git a/TAO/tao/Any_SystemException.cpp b/TAO/tao/Any_SystemException.cpp
deleted file mode 100644
index 84d3444f252..00000000000
--- a/TAO/tao/Any_SystemException.cpp
+++ /dev/null
@@ -1,206 +0,0 @@
-// $Id$
-
-#include "Any_SystemException.h"
-#include "Any.h"
-#include "Any_Unknown_IDL_Type.h"
-#include "CDR.h"
-#include "Exception.h"
-#include "Environment.h"
-#include "Marshal.h"
-#include "CORBA_String.h"
-#include "SystemException.h"
-#include "TypeCode.h"
-
-#include "ace/Auto_Ptr.h"
-#include "ace/CORBA_macros.h"
-#include "ace/Auto_Ptr.h"
-
-
-ACE_RCSID (tao,
-           Any_SystemException,
-           "$Id$")
-
-
-TAO::Any_SystemException::Any_SystemException (_tao_destructor destructor,
-                                               CORBA::TypeCode_ptr tc,
-                                               CORBA::SystemException * const val)
-  : Any_Impl (destructor,
-              tc),
-    value_ (val)
-{
-}
-
-TAO::Any_SystemException::Any_SystemException (_tao_destructor destructor,
-                                               CORBA::TypeCode_ptr tc,
-                                               const CORBA::SystemException & val)
-  : Any_Impl (destructor,
-              tc)
-{
- this->value_ =
-   dynamic_cast <CORBA::SystemException *> (val._tao_duplicate ());
-}
-
-TAO::Any_SystemException::Any_SystemException (CORBA::TypeCode_ptr tc)
-  : Any_Impl (0,
-              tc)
-{
-}
-
-TAO::Any_SystemException::~Any_SystemException (void)
-{
-}
-
-void
-TAO::Any_SystemException::insert (CORBA::Any & any,
-                                  _tao_destructor destructor,
-                                  CORBA::TypeCode_ptr tc,
-                                  CORBA::SystemException * const value)
-{
-  Any_SystemException *new_impl = 0;
-  ACE_NEW (new_impl,
-           Any_SystemException (destructor,
-                                tc,
-                                value));
-  any.replace (new_impl);
-}
-
-void
-TAO::Any_SystemException::insert_copy (CORBA::Any & any,
-                                       _tao_destructor destructor,
-                                       CORBA::TypeCode_ptr tc,
-                                       const CORBA::SystemException & value)
-{
-  Any_SystemException *new_impl = 0;
-  ACE_NEW (new_impl,
-           Any_SystemException (destructor,
-                                tc,
-                                value));
-  any.replace (new_impl);
-}
-
-CORBA::Boolean
-TAO::Any_SystemException::extract (const CORBA::Any & any,
-                                   _tao_destructor destructor,
-                                   CORBA::TypeCode_ptr tc,
-                                   const CORBA::SystemException *& _tao_elem,
-                                   TAO::excp_factory f)
-{
-  _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 ();
-
-      if (!impl->encoded ())
-        {
-          TAO::Any_SystemException *narrow_impl =
-            dynamic_cast <TAO::Any_SystemException *> (impl);
-
-          if (narrow_impl == 0)
-            {
-              return 0;
-            }
-
-          _tao_elem = narrow_impl->value_;
-          return 1;
-        }
-
-      CORBA::SystemException *empty_value =  (*f) ();
-
-      TAO::Any_SystemException *replacement = 0;
-      ACE_NEW_RETURN (replacement,
-                      TAO::Any_SystemException (destructor,
-                                                any_tc,
-                                                empty_value),
-                      0);
-
-      auto_ptr<TAO::Any_SystemException > replacement_safety (replacement);
-
-      // We know this will work since the unencoded case is covered above.  
-      TAO::Unknown_IDL_Type *unk =
-        dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-
-      // We don't want the rd_ptr of unk to move, in case it is
-      // shared by another Any. This copies the state, not the buffer.
-      TAO_InputCDR for_reading (unk->_tao_get_cdr ());
-
-      CORBA::Boolean good_decode =
-        replacement->demarshal_value (for_reading);
-
-      if (good_decode)
-        {
-          _tao_elem = replacement->value_;
-          const_cast<CORBA::Any &> (any).replace (replacement);
-          replacement_safety.release ();
-          return 1;
-        }
-    }
-  ACE_CATCHANY
-    {
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-void
-TAO::Any_SystemException::free_value (void)
-{
-  if (this->value_destructor_ != 0)
-    {
-      (*this->value_destructor_) (this->value_);
-      this->value_destructor_ = 0;
-    }
-
-  this->value_ = 0;
-}
-
-const void *
-TAO::Any_SystemException::value (void) const
-{
-  return this->value_;
-}
-
-CORBA::Boolean
-TAO::Any_SystemException::marshal_value (TAO_OutputCDR &cdr)
-{
-  ACE_TRY_NEW_ENV
-    {
-      this->value_->_tao_encode (cdr
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      return 1;
-    }
-  ACE_CATCHANY
-    {
-    }
-  ACE_ENDTRY;
-  return 0;
-}
-
-CORBA::Boolean
-TAO::Any_SystemException::demarshal_value (TAO_InputCDR &cdr)
-{
-  ACE_TRY_NEW_ENV
-    {
-      this->value_->_tao_decode (cdr
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      return 1;
-    }
-  ACE_CATCHANY
-    {
-    }
-  ACE_ENDTRY;
-  return 0;
-}
diff --git a/TAO/tao/Any_SystemException.h b/TAO/tao/Any_SystemException.h
deleted file mode 100644
index 971e22d6a5f..00000000000
--- a/TAO/tao/Any_SystemException.h
+++ /dev/null
@@ -1,85 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Any_SystemException.h
- *
- *  $Id$
- *
- *  @authors  Carlos O'Ryan and Jeff Parsons
- */
-//=============================================================================
-#ifndef TAO_ANY_SYSTEMEXCEPTION_H
-#define TAO_ANY_SYSTEMEXCEPTION_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Any_Impl.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace CORBA
-{
-  class SystemException;
-  class Any;
-}
-
-namespace TAO
-{
-  typedef CORBA::SystemException* (*excp_factory)(void);
-
-  /**
-   * @class Any_Exception
-   *
-   * @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.
-   */
-  class Any_SystemException : public Any_Impl
-  {
-  public:
-    Any_SystemException (_tao_destructor destructor,
-                         CORBA::TypeCode_ptr,
-                         CORBA::SystemException* const);
-
-    Any_SystemException (_tao_destructor destructor,
-                         CORBA::TypeCode_ptr,
-                         const CORBA::SystemException &);
-
-    Any_SystemException (CORBA::TypeCode_ptr);
-
-    virtual ~Any_SystemException (void);
-
-    static void insert (CORBA::Any &,
-                        _tao_destructor,
-                        CORBA::TypeCode_ptr,
-                        CORBA::SystemException * const);
-
-    static void insert_copy (CORBA::Any &,
-                             _tao_destructor destructor,
-                             CORBA::TypeCode_ptr,
-                             const CORBA::SystemException &);
-
-    static CORBA::Boolean extract (const CORBA::Any &,
-                                   _tao_destructor,
-                                   CORBA::TypeCode_ptr,
-                                   const CORBA::SystemException *&,
-                                   excp_factory f);
-
-    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:
-    CORBA::SystemException *value_;
-  };
-}
-
-#include /**/ "ace/post.h"
-#endif /*TAO_ANY_SYSTEMEXCEPTION_H*/
diff --git a/TAO/tao/Any_Unknown_IDL_Type.cpp b/TAO/tao/Any_Unknown_IDL_Type.cpp
deleted file mode 100644
index b7b78214719..00000000000
--- a/TAO/tao/Any_Unknown_IDL_Type.cpp
+++ /dev/null
@@ -1,288 +0,0 @@
-// $Id$
-
-#include "tao/Any_Unknown_IDL_Type.h"
-#include "tao/Valuetype_Adapter.h"
-#include "tao/ORB_Core.h"
-#include "tao/SystemException.h"
-#include "tao/Marshal.h"
-#include "tao/TypeCode.h"
-#include "tao/CDR.h"
-
-#include "ace/Dynamic_Service.h"
-#include "ace/OS_NS_string.h"
-
-
-ACE_RCSID (tao,
-           Any_Unknown_IDL_Type,
-           "$Id$")
-           
-
-TAO::Unknown_IDL_Type::Unknown_IDL_Type (
-    CORBA::TypeCode_ptr tc,
-    TAO_InputCDR &cdr
-  )
-  : TAO::Any_Impl (0, tc, true),
-    cdr_ (static_cast<ACE_Message_Block *> (0))
-{
-  ACE_TRY_NEW_ENV
-    {
-      this->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (CORBA::Exception, ex)
-    {
-    }
-  ACE_ENDTRY;
-}
-
-TAO::Unknown_IDL_Type::Unknown_IDL_Type (
-    CORBA::TypeCode_ptr tc
-  )
-  : TAO::Any_Impl (0, tc, true),
-    cdr_ (static_cast<ACE_Message_Block *> (0))
-{
-}
-
-TAO::Unknown_IDL_Type::~Unknown_IDL_Type (void)
-{
-}
-
-CORBA::Boolean
-TAO::Unknown_IDL_Type::marshal_value (TAO_OutputCDR &cdr)
-{
-  ACE_TRY_NEW_ENV
-    {
-      // We don't want the rd_ptr to move, in case we are shared by
-      // another Any, so we use this to copy the state, not the buffer.
-      TAO_InputCDR for_reading (this->cdr_);
-    
-      TAO::traverse_status status =
-        TAO_Marshal_Object::perform_append (this->type_,
-                                            &for_reading,
-                                            &cdr
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (status != TAO::TRAVERSE_CONTINUE)
-        {
-          return 0;
-        }
-    }
-  ACE_CATCH (CORBA::Exception, ex)
-    {
-      return 0;
-    }
-  ACE_ENDTRY;
-
-  return 1;
-}
-
-const void *
-TAO::Unknown_IDL_Type::value (void) const
-{
-  return this->cdr_.start ();
-}
-
-void
-TAO::Unknown_IDL_Type::free_value (void)
-{
-  CORBA::release (this->type_);
-}
-
-TAO_InputCDR &
-TAO::Unknown_IDL_Type::_tao_get_cdr (void)
-{
-  return this->cdr_;
-}
-
-int
-TAO::Unknown_IDL_Type::_tao_byte_order (void) const
-{
-  return this->cdr_.byte_order ();
-}
-void
-TAO::Unknown_IDL_Type::_tao_decode (TAO_InputCDR &cdr
-                                    ACE_ENV_ARG_DECL)
-{
-  // @@ (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 ();
-
-  // Skip over the next argument.
-  TAO::traverse_status status =
-    TAO_Marshal_Object::perform_skip (this->type_,
-                                      &cdr
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (status != TAO::TRAVERSE_CONTINUE)
-    {
-      ACE_THROW (CORBA::MARSHAL ());
-    }
-
-  // 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 new_mb (size + 2 * ACE_CDR::MAX_ALIGNMENT);
-
-  ACE_CDR::mb_align (&new_mb);
-  ptrdiff_t offset = ptrdiff_t (begin) % ACE_CDR::MAX_ALIGNMENT;
-
-  if (offset < 0)
-    {
-      offset += ACE_CDR::MAX_ALIGNMENT;
-    }
-
-  new_mb.rd_ptr (offset);
-  new_mb.wr_ptr (offset + size);
-
-  ACE_OS::memcpy (new_mb.rd_ptr (),
-                  begin,
-                  size);
-
-  this->cdr_.reset (&new_mb, cdr.byte_order ());
-  this->cdr_.char_translator (cdr.char_translator ());
-  this->cdr_.wchar_translator (cdr.wchar_translator ());
-}
-
-CORBA::Boolean
-TAO::Unknown_IDL_Type::to_object (CORBA::Object_ptr &obj) const
-{
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ULong kind =
-        this->type_->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::TypeCode_var tcvar =
-        CORBA::TypeCode::_duplicate (this->type_);
-
-      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;
-        }
-
-      return this->cdr_ >> obj;
-    }
-  ACE_CATCH (CORBA::Exception, ex)
-    {
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-CORBA::Boolean
-TAO::Unknown_IDL_Type::to_value (CORBA::ValueBase *&val) const
-{
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ULong kind =
-        this->type_->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::TypeCode_var tcvar =
-        CORBA::TypeCode::_duplicate (this->type_);
-
-      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_Valuetype_Adapter *adapter =
-        ACE_Dynamic_Service<TAO_Valuetype_Adapter>::instance (
-            TAO_ORB_Core::valuetype_adapter_name ()
-          );
-
-      if (adapter == 0)
-        {
-          ACE_THROW_RETURN (CORBA::INTERNAL (),
-                            0);
-        }
-
-      return adapter->stream_to_value (this->cdr_, val);
-    }
-  ACE_CATCH (CORBA::Exception, ex)
-    {
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-CORBA::Boolean
-TAO::Unknown_IDL_Type::to_abstract_base (CORBA::AbstractBase_ptr &obj) const
-{
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ULong kind =
-        this->type_->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::TypeCode_var tcvar =
-        CORBA::TypeCode::_duplicate (this->type_);
-
-      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_Valuetype_Adapter *adapter =
-        ACE_Dynamic_Service<TAO_Valuetype_Adapter>::instance (
-            TAO_ORB_Core::valuetype_adapter_name ()
-          );
-
-      if (adapter == 0)
-        {
-          ACE_THROW_RETURN (CORBA::INTERNAL (),
-                            0);
-        }
-
-      return adapter->stream_to_abstract_base (this->cdr_,
-                                               obj);
-    }
-  ACE_CATCH (CORBA::Exception, ex)
-    {
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/tao/Any_Unknown_IDL_Type.h b/TAO/tao/Any_Unknown_IDL_Type.h
deleted file mode 100644
index c764dc367e0..00000000000
--- a/TAO/tao/Any_Unknown_IDL_Type.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// -*- C++ -*-
-//=============================================================================
-/**
- *  @file    Any_Unknown_IDL_Type.h
- *
- *  $Id$
- *
- *  @authors  Carlos O'Ryan and Jeff Parsons
- */
-//=============================================================================
-
-#ifndef TAO_ANY_UNKNOWN_IDL_TYPE_H
-#define TAO_ANY_UNKNOWN_IDL_TYPE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Any_Impl.h"
-#include "tao/CDR.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class ACE_Char_Codeset_Translator;
-class ACE_WChar_Codeset_Translator;
-
-namespace TAO
-{
-  /**
-   * @class Unknown_IDL_Type
-   *
-   * @brief CDR-based Any impl class.
-   *
-   * Used when demarshaling an Any, and with DII/DSI, and Dynamic Anys.
-   */
-  class TAO_Export Unknown_IDL_Type : public Any_Impl
-  {
-  public:
-    Unknown_IDL_Type (CORBA::TypeCode_ptr,
-                      TAO_InputCDR &cdr);
-                  
-    Unknown_IDL_Type (CORBA::TypeCode_ptr);
-                      
-    virtual ~Unknown_IDL_Type (void);
-
-    virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
-    virtual const void *value (void) const;
-    virtual void free_value (void);
-
-    virtual TAO_InputCDR &_tao_get_cdr (void);
-    virtual int _tao_byte_order (void) const;
-
-    virtual void _tao_decode (TAO_InputCDR &
-                              ACE_ENV_ARG_DECL);
-
-    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;
-
-  private:
-    mutable TAO_InputCDR cdr_;
-  };
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ANY_UNKNOWN_IDL_TYPE_H */
diff --git a/TAO/tao/Arg_Traits_T.h b/TAO/tao/Arg_Traits_T.h
index b4a86c197c3..e384db4a2ad 100644
--- a/TAO/tao/Arg_Traits_T.h
+++ b/TAO/tao/Arg_Traits_T.h
@@ -10,7 +10,6 @@
  */
 //=============================================================================
 
-
 #ifndef TAO_ARG_TRAITS_T_H
 #define TAO_ARG_TRAITS_T_H
 
@@ -31,16 +30,6 @@ namespace TAO
   class Arg_Traits
   {
   };
-
-  /**
-   *
-   * @brief Base class for all skeleton arg traits specializations.
-   *
-   */
-  template<typename T>
-  class SArg_Traits
-  {
-  };
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Argument.cpp b/TAO/tao/Argument.cpp
index e038eeec2d7..98e0861d980 100644
--- a/TAO/tao/Argument.cpp
+++ b/TAO/tao/Argument.cpp
@@ -10,26 +10,46 @@ TAO::Argument::~Argument (void)
 CORBA::Boolean
 TAO::Argument::marshal (TAO_OutputCDR &)
 {
-  return 1;
+  return true;
 }
 
 CORBA::Boolean
 TAO::Argument::demarshal (TAO_InputCDR &)
 {
-  return 1;
+  return true;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
 void
-TAO::Argument::interceptor_param (Dynamic::Parameter &)
+TAO::Argument::interceptor_value (CORBA::Any *) const
 {
 }
 
-void
-TAO::Argument::interceptor_result (CORBA::Any *)
+CORBA::ParameterMode
+TAO::InArgument::mode (void) const
+{
+  return CORBA::PARAM_IN;
+}
+
+CORBA::ParameterMode
+TAO::InoutArgument::mode (void) const
 {
+  return CORBA::PARAM_INOUT;
+}
+
+CORBA::ParameterMode
+TAO::OutArgument::mode (void) const
+{
+  return CORBA::PARAM_OUT;
+}
+
+CORBA::ParameterMode
+TAO::RetArgument::mode (void) const
+{
+  return CORBA::PARAM_OUT;
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
+
diff --git a/TAO/tao/Argument.h b/TAO/tao/Argument.h
index 0a42a2a7064..edad3568278 100644
--- a/TAO/tao/Argument.h
+++ b/TAO/tao/Argument.h
@@ -24,11 +24,7 @@
 
 #include "tao/orbconf.h"
 #include "tao/TAO_Export.h"
-
-namespace Dynamic
-{
-  struct Parameter;
-}
+#include "tao/ParameterModeC.h"
 
 namespace CORBA
 {
@@ -61,7 +57,7 @@ namespace TAO
     /**
      * @note The default implementation simply returns @c true.
      */
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 
     /// Demarshal the argument from the given CDR input stream.
     /**
@@ -80,23 +76,51 @@ namespace TAO
      * value, if either or both exist.
      */
     //@{
-    /// Populate the given @a Dynamic::Parameter argument.
-    /**
-     * @note The default implementation is a no-op.
-     */
-    virtual void interceptor_param (Dynamic::Parameter &);
-
     /// Populate the given @a CORBA::Any result argument.
     /**
      * @note The default implementation is a no-op.
      */
-    virtual void interceptor_result (CORBA::Any *);
+    virtual void interceptor_value (CORBA::Any *) const;
+
+    /// Get the parameter mode of this argument
+    virtual CORBA::ParameterMode mode (void) const = 0;
     //@}
 
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
 
   };
 
+  class TAO_Export InArgument : public Argument
+  {
+  public:
+#if TAO_HAS_INTERCEPTORS == 1
+    virtual CORBA::ParameterMode mode (void) const;
+#endif
+  };
+
+  class TAO_Export InoutArgument : public Argument
+  {
+  public:
+#if TAO_HAS_INTERCEPTORS == 1
+    virtual CORBA::ParameterMode mode (void) const;
+#endif
+  };
+
+  class TAO_Export OutArgument : public Argument
+  {
+  public:
+#if TAO_HAS_INTERCEPTORS == 1
+    virtual CORBA::ParameterMode mode (void) const;
+#endif
+  };
+
+  class TAO_Export RetArgument : public Argument
+  {
+  public:
+#if TAO_HAS_INTERCEPTORS == 1
+    virtual CORBA::ParameterMode mode (void) const;
+#endif
+  };
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Array_VarOut_T.h b/TAO/tao/Array_VarOut_T.h
index f2e07430c24..45b0acd196c 100644
--- a/TAO/tao/Array_VarOut_T.h
+++ b/TAO/tao/Array_VarOut_T.h
@@ -169,7 +169,7 @@ class TAO_Array_Forany_T
 {
 public:
   TAO_Array_Forany_T (void);
-  TAO_Array_Forany_T (T_slice *,
+  TAO_Array_Forany_T (const T_slice *,
                       CORBA::Boolean nocopy = 0);
   TAO_Array_Forany_T (const TAO_Array_Forany_T<T,T_slice,TAG> &);
   ~TAO_Array_Forany_T (void);
diff --git a/TAO/tao/Array_VarOut_T.inl b/TAO/tao/Array_VarOut_T.inl
index b65c4145304..5eda36c3566 100644
--- a/TAO/tao/Array_VarOut_T.inl
+++ b/TAO/tao/Array_VarOut_T.inl
@@ -58,7 +58,7 @@ ACE_INLINE
 const T_slice *
 TAO_Array_Var_Base_T<T,T_slice,TAG>::in (void) const
 {
-  return (const T_slice *) this->ptr_;
+  return const_cast <const T_slice *> (this->ptr_);
 }
 
 template<typename T, typename T_slice, typename TAG>
@@ -247,10 +247,10 @@ TAO_Array_Forany_T<T,T_slice,TAG>::TAO_Array_Forany_T (void)
 template<typename T, typename T_slice, typename TAG>
 ACE_INLINE
 TAO_Array_Forany_T<T,T_slice,TAG>::TAO_Array_Forany_T (
-    T_slice * p,
+    const T_slice * p,
     CORBA::Boolean nocopy
   )
-  : ptr_ (p),
+  : ptr_ (const_cast <T_slice *>(p)),
     nocopy_ (nocopy)
 {}
 
diff --git a/TAO/tao/Asynch_Queued_Message.h b/TAO/tao/Asynch_Queued_Message.h
index 7319edacba1..f6225a48b45 100644
--- a/TAO/tao/Asynch_Queued_Message.h
+++ b/TAO/tao/Asynch_Queued_Message.h
@@ -50,7 +50,8 @@ public:
   /// Destructor
   virtual ~TAO_Asynch_Queued_Message (void);
 
-  /** Implement the Template Methods from TAO_Queued_Message
+  /**
+   * @name Implement the Template Methods from TAO_Queued_Message
    */
   //@{
   virtual size_t message_length (void) const;
diff --git a/TAO/tao/BD_String_Argument_T.cpp b/TAO/tao/BD_String_Argument_T.cpp
index cd1625d1ced..2734394a30f 100644
--- a/TAO/tao/BD_String_Argument_T.cpp
+++ b/TAO/tao/BD_String_Argument_T.cpp
@@ -4,7 +4,6 @@
 #define TAO_BD_STRING_ARGUMENT_T_C
 
 #include "tao/BD_String_Argument_T.h"
-#include "tao/Dynamic_ParameterC.h"
 
 #if !defined (__ACE_INLINE__)
 #include "tao/BD_String_Argument_T.inl"
@@ -14,9 +13,13 @@ ACE_RCSID (tao,
            BD_String_Argument_T,
            "$Id$")
 
-template<typename S, typename to_S, typename from_S, size_t BOUND>
+template<typename S,
+         typename to_S,
+         typename from_S,
+         size_t BOUND,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::In_BD_String_Argument_T<S,to_S,from_S,BOUND>::marshal (
+TAO::In_BD_String_Argument_T<S,to_S,from_S,BOUND,Insert_Policy>::marshal (
     TAO_OutputCDR & cdr
   )
 {
@@ -25,32 +28,42 @@ TAO::In_BD_String_Argument_T<S,to_S,from_S,BOUND>::marshal (
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, typename to_S, typename from_S, size_t BOUND>
+template<typename S,
+         typename to_S,
+         typename from_S,
+         size_t BOUND,
+         typename Insert_Policy>
 void
-TAO::In_BD_String_Argument_T<S,to_S,from_S,BOUND>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::In_BD_String_Argument_T<S,to_S,from_S,BOUND,Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  p.argument <<= from_S (this->x_, BOUND);
-  p.mode = CORBA::PARAM_IN;
+  this->Insert_Policy::any_insert (any, from_S (this->x_, BOUND));
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ===========================================================
 
-template<typename S, typename to_S, typename from_S, size_t BOUND>
+template<typename S,
+         typename to_S,
+         typename from_S,
+         size_t BOUND,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_BD_String_Argument_T<S,to_S,from_S,BOUND>::marshal (
+TAO::Inout_BD_String_Argument_T<S,to_S,from_S,BOUND,Insert_Policy>::marshal (
     TAO_OutputCDR & cdr
   )
 {
   return cdr << from_S (this->x_, BOUND);
 }
 
-template<typename S, typename to_S, typename from_S, size_t BOUND>
+template<typename S,
+         typename to_S,
+         typename from_S,
+         size_t BOUND,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_BD_String_Argument_T<S,to_S,from_S,BOUND>::demarshal (
+TAO::Inout_BD_String_Argument_T<S,to_S,from_S,BOUND,Insert_Policy>::demarshal (
     TAO_InputCDR & cdr
   )
 {
@@ -60,27 +73,30 @@ TAO::Inout_BD_String_Argument_T<S,to_S,from_S,BOUND>::demarshal (
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, typename to_S, typename from_S, size_t BOUND>
+template<typename S,
+         typename to_S,
+         typename from_S,
+         size_t BOUND,
+         typename Insert_Policy>
 void
-TAO::Inout_BD_String_Argument_T<S,to_S,from_S,BOUND>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::Inout_BD_String_Argument_T<S,to_S,from_S,BOUND,Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  p.argument <<= from_S (this->x_, BOUND);
-  p.mode = CORBA::PARAM_INOUT;
+  this->Insert_Policy::any_insert (any, from_S (this->x_, BOUND));
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ==============================================================
 
-template<typename S, 
-         typename S_out, 
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
+template<typename S,
+         typename S_out,
+         typename to_S,
+         typename from_S,
+         size_t BOUND,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Out_BD_String_Argument_T<S,S_out,to_S,from_S,BOUND>::demarshal (
+TAO::Out_BD_String_Argument_T<S,S_out,to_S,from_S,BOUND,Insert_Policy>::demarshal (
     TAO_InputCDR & cdr
   )
 {
@@ -89,31 +105,31 @@ TAO::Out_BD_String_Argument_T<S,S_out,to_S,from_S,BOUND>::demarshal (
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, 
-         typename S_out, 
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
+template<typename S,
+         typename S_out,
+         typename to_S,
+         typename from_S,
+         size_t BOUND,
+         typename Insert_Policy>
 void
-TAO::Out_BD_String_Argument_T<S,S_out,to_S,from_S,BOUND>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::Out_BD_String_Argument_T<S,S_out,to_S,from_S,BOUND,Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  p.argument <<= from_S (this->x_, BOUND);
-  p.mode = CORBA::PARAM_OUT;
+  this->Insert_Policy::any_insert (any, from_S (this->x_, BOUND));
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ============================================================
 
-template<typename S, 
-         typename S_var, 
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
+template<typename S,
+         typename S_var,
+         typename to_S,
+         typename from_S,
+         size_t BOUND,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Ret_BD_String_Argument_T<S,S_var,to_S,from_S,BOUND>::demarshal (
+TAO::Ret_BD_String_Argument_T<S,S_var,to_S,from_S,BOUND,Insert_Policy>::demarshal (
     TAO_InputCDR & cdr
   )
 {
@@ -122,17 +138,17 @@ TAO::Ret_BD_String_Argument_T<S,S_var,to_S,from_S,BOUND>::demarshal (
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, 
-         typename S_var, 
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
+template<typename S,
+         typename S_var,
+         typename to_S,
+         typename from_S,
+         size_t BOUND,
+         typename Insert_Policy>
 void
-TAO::Ret_BD_String_Argument_T<S,S_var,to_S,from_S,BOUND>::interceptor_result (
-    CORBA::Any * any
-  )
+TAO::Ret_BD_String_Argument_T<S,S_var,to_S,from_S,BOUND,Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  (*any) <<= from_S (this->x_.in (), BOUND);
+  this->Insert_Policy::any_insert (any, from_S (this->x_.in (), BOUND));
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
diff --git a/TAO/tao/BD_String_Argument_T.h b/TAO/tao/BD_String_Argument_T.h
index 20a8e86e45b..7a2fdc4eddd 100644
--- a/TAO/tao/BD_String_Argument_T.h
+++ b/TAO/tao/BD_String_Argument_T.h
@@ -23,6 +23,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/Argument.h"
+#include "tao/Any_Insert_Policy_T.h"
 
 namespace TAO
 {
@@ -32,16 +33,20 @@ namespace TAO
    * @brief Template class for IN bounded (w)string argument.
    *
    */
-  template<typename S, typename to_S, typename from_S, size_t BOUND>
-  class In_BD_String_Argument_T : public Argument
+  template<typename S,
+           typename to_S,
+           typename from_S,
+           size_t BOUND,
+           typename Insert_Policy>
+  class In_BD_String_Argument_T : public InArgument, private Insert_Policy
   {
   public:
     In_BD_String_Argument_T (const S * x);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
 
     S const * arg (void) const;
@@ -58,16 +63,20 @@ namespace TAO
    * @brief Template class for INOUT bounded (w)string argument.
    *
    */
-  template<typename S, typename to_S, typename from_S, size_t BOUND>
-  class Inout_BD_String_Argument_T : public Argument
+  template<typename S,
+           typename to_S,
+           typename from_S,
+           size_t BOUND,
+           typename Insert_Policy>
+  class Inout_BD_String_Argument_T : public InoutArgument, private Insert_Policy
   {
   public:
     Inout_BD_String_Argument_T (S *& x);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S *& arg (void);
 
@@ -78,22 +87,23 @@ namespace TAO
   /**
    * @class Out_BD_String_Argument_T
    *
-   * @brief Template class for INOUT bounded (w)string argument.
+   * @brief Template class for OUT bounded (w)string argument.
    *
    */
   template<typename S,
            typename S_out,
            typename to_S,
            typename from_S,
-           size_t BOUND>
-  class Out_BD_String_Argument_T : public Argument
+           size_t BOUND,
+           typename Insert_Policy>
+  class Out_BD_String_Argument_T : public OutArgument, private Insert_Policy
   {
   public:
     Out_BD_String_Argument_T (S_out x);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S *& arg (void);
 
@@ -111,15 +121,16 @@ namespace TAO
            typename S_var,
            typename to_S,
            typename from_S,
-           size_t BOUND>
-  class Ret_BD_String_Argument_T : public Argument
+           size_t BOUND,
+           typename Insert_Policy>
+  class Ret_BD_String_Argument_T : public RetArgument, private Insert_Policy
   {
   public:
     Ret_BD_String_Argument_T (void);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_result (CORBA::Any *);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S *& arg (void);
 
@@ -151,7 +162,8 @@ namespace TAO
            typename T_out,
            typename to_T,
            typename from_T,
-           size_t BOUND>
+           size_t BOUND,
+           typename Insert_Policy>
   struct BD_String_Arg_Traits_T
   {
     typedef T *                                   ret_type;
@@ -162,52 +174,28 @@ namespace TAO
     typedef In_BD_String_Argument_T<T,
                                     to_T,
                                     from_T,
-                                    BOUND>        in_arg_val;
+                                    BOUND,
+                                    Insert_Policy>        in_arg_val;
     typedef Inout_BD_String_Argument_T<T,
                                        to_T,
                                        from_T,
-                                       BOUND>     inout_arg_val;
+                                       BOUND,
+                                       Insert_Policy>     inout_arg_val;
     typedef Out_BD_String_Argument_T<T,
                                      T_out,
                                      to_T,
                                      from_T,
-                                     BOUND>       out_arg_val;
+                                     BOUND,
+                                     Insert_Policy>       out_arg_val;
     typedef Ret_BD_String_Argument_T<T,
                                      T_var,
                                      to_T,
                                      from_T,
-                                     BOUND>       ret_val;
+                                     BOUND,
+                                     Insert_Policy>       ret_val;
 
     typedef BD_String_Tag                         idl_tag;
   };
-
-  /**
-   *
-   * @brief Specializations for bounded (w)strings
-   *
-   */
-
-  template<size_t BOUND>
-  class BD_String_Arg_Traits
-    : public BD_String_Arg_Traits_T<CORBA::Char,
-                                    CORBA::String_var,
-                                    CORBA::String_out,
-                                    ACE_InputCDR::to_string,
-                                    ACE_OutputCDR::from_string,
-                                    BOUND>
-  {
-  };
-
-  template<size_t BOUND>
-  class BD_WString_Arg_Traits
-    : public BD_String_Arg_Traits_T<CORBA::WChar,
-                                    CORBA::WString_var,
-                                    CORBA::WString_out,
-                                    ACE_InputCDR::to_wstring,
-                                    ACE_OutputCDR::from_wstring,
-                                    BOUND>
-  {
-  };
 }
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/BD_String_Argument_T.inl b/TAO/tao/BD_String_Argument_T.inl
index c75c60911fc..a21a1e227b7 100644
--- a/TAO/tao/BD_String_Argument_T.inl
+++ b/TAO/tao/BD_String_Argument_T.inl
@@ -1,108 +1,130 @@
 // $Id$
 
-template<typename S, typename to_S, typename from_S, size_t BOUND>
+template<typename S,
+         typename to_S,
+         typename from_S,
+         size_t BOUND,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::In_BD_String_Argument_T<S,to_S,from_S,BOUND>::In_BD_String_Argument_T (
+TAO::In_BD_String_Argument_T<S,to_S,from_S,BOUND,Insert_Policy>::In_BD_String_Argument_T (
     const S * x
   )
   : x_ (x)
 {}
 
-template<typename S, typename to_S, typename from_S, size_t BOUND>
+template<typename S,
+         typename to_S,
+         typename from_S,
+         size_t BOUND,
+         typename Insert_Policy>
 ACE_INLINE
 const S *
-TAO::In_BD_String_Argument_T<S,to_S,from_S,BOUND>::arg (void) const
+TAO::In_BD_String_Argument_T<S,to_S,from_S,BOUND,Insert_Policy>::arg (void) const
 {
   return this->x_;
 }
 
 // ==========================================================================
 
-template<typename S, typename to_S, typename from_S, size_t BOUND>
+template<typename S,
+         typename to_S,
+         typename from_S,
+         size_t BOUND,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Inout_BD_String_Argument_T<S,to_S,from_S,BOUND>::
+TAO::Inout_BD_String_Argument_T<S,to_S,from_S,BOUND,Insert_Policy>::
 Inout_BD_String_Argument_T (S *& x)
   : x_ (x)
 {}
 
-template<typename S, typename to_S, typename from_S, size_t BOUND>
+template<typename S,
+         typename to_S,
+         typename from_S,
+         size_t BOUND,
+         typename Insert_Policy>
 ACE_INLINE
 S *&
-TAO::Inout_BD_String_Argument_T<S,to_S,from_S,BOUND>::arg (void)
+TAO::Inout_BD_String_Argument_T<S,to_S,from_S,BOUND,Insert_Policy>::arg (void)
 {
   return this->x_;
 }
 
 // ==========================================================================
 
-template<typename S, 
-         typename S_out, 
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
+template<typename S,
+         typename S_out,
+         typename to_S,
+         typename from_S,
+         size_t BOUND,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Out_BD_String_Argument_T<S,S_out,to_S,from_S,BOUND>::
+TAO::Out_BD_String_Argument_T<S,S_out,to_S,from_S,BOUND,Insert_Policy>::
 Out_BD_String_Argument_T (S_out x)
   : x_ (x.ptr ())
 {}
 
-template<typename S, 
-         typename S_out, 
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
+template<typename S,
+         typename S_out,
+         typename to_S,
+         typename from_S,
+         size_t BOUND,
+         typename Insert_Policy>
 ACE_INLINE
 S *&
-TAO::Out_BD_String_Argument_T<S,S_out,to_S,from_S,BOUND>::arg (void)
+TAO::Out_BD_String_Argument_T<S,S_out,to_S,from_S,BOUND,Insert_Policy>::arg (void)
 {
   return this->x_;
 }
 
 // ==========================================================================
 
-template<typename S, 
-         typename S_var, 
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
+template<typename S,
+         typename S_var,
+         typename to_S,
+         typename from_S,
+         size_t BOUND,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Ret_BD_String_Argument_T<S,S_var,to_S,from_S,BOUND>::
+TAO::Ret_BD_String_Argument_T<S,S_var,to_S,from_S,BOUND,Insert_Policy>::
 Ret_BD_String_Argument_T (void)
 {
 }
 
-template<typename S, 
-         typename S_var, 
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
+template<typename S,
+         typename S_var,
+         typename to_S,
+         typename from_S,
+         size_t BOUND,
+         typename Insert_Policy>
 ACE_INLINE
 S *
-TAO::Ret_BD_String_Argument_T<S,S_var,to_S,from_S,BOUND>::excp (void)
+TAO::Ret_BD_String_Argument_T<S,S_var,to_S,from_S,BOUND,Insert_Policy>::excp (void)
 {
   return this->x_.ptr ();
 }
 
-template<typename S, 
-         typename S_var, 
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
+template<typename S,
+         typename S_var,
+         typename to_S,
+         typename from_S,
+         size_t BOUND,
+         typename Insert_Policy>
 ACE_INLINE
 S *
-TAO::Ret_BD_String_Argument_T<S,S_var,to_S,from_S,BOUND>::retn (void)
+TAO::Ret_BD_String_Argument_T<S,S_var,to_S,from_S,BOUND,Insert_Policy>::retn (void)
 {
   return this->x_._retn ();
 }
 
-template<typename S, 
-         typename S_var, 
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
+template<typename S,
+         typename S_var,
+         typename to_S,
+         typename from_S,
+         size_t BOUND,
+         typename Insert_Policy>
 ACE_INLINE
 S *&
-TAO::Ret_BD_String_Argument_T<S,S_var,to_S,from_S,BOUND>::arg (void)
+TAO::Ret_BD_String_Argument_T<S,S_var,to_S,from_S,BOUND,Insert_Policy>::arg (void)
 {
   return this->x_.out ();
 }
diff --git a/TAO/tao/Basic_Argument_T.cpp b/TAO/tao/Basic_Argument_T.cpp
index 353d125e7a8..f798eb09887 100644
--- a/TAO/tao/Basic_Argument_T.cpp
+++ b/TAO/tao/Basic_Argument_T.cpp
@@ -4,7 +4,6 @@
 #define TAO_BASIC_ARGUMENT_T_C
 
 #include "tao/Basic_Argument_T.h"
-#include "tao/Dynamic_ParameterC.h"
 
 #if !defined (__ACE_INLINE__)
 #include "tao/Basic_Argument_T.inl"
@@ -14,90 +13,87 @@ ACE_RCSID (tao,
            Basic_Argument_T,
            "$Id$")
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 CORBA::Boolean
-TAO::In_Basic_Argument_T<S>::marshal (TAO_OutputCDR & cdr)
+TAO::In_Basic_Argument_T<S, Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << this->x_;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 void
-TAO::In_Basic_Argument_T<S>::interceptor_param (Dynamic::Parameter & p)
+TAO::In_Basic_Argument_T<S, Insert_Policy>::interceptor_value (CORBA::Any *any) const
 {
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_IN;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ===========================================================
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_Basic_Argument_T<S>::marshal (TAO_OutputCDR & cdr)
+TAO::Inout_Basic_Argument_T<S, Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << this->x_;
 }
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_Basic_Argument_T<S>::demarshal (TAO_InputCDR & cdr)
+TAO::Inout_Basic_Argument_T<S, Insert_Policy>::demarshal (TAO_InputCDR & cdr)
 {
   return cdr >> this->x_;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 void
-TAO::Inout_Basic_Argument_T<S>::interceptor_param (Dynamic::Parameter & p)
+TAO::Inout_Basic_Argument_T<S, Insert_Policy>::interceptor_value (CORBA::Any *any) const
 {
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_INOUT;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ==============================================================
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 CORBA::Boolean
-TAO::Out_Basic_Argument_T<S>::demarshal (TAO_InputCDR & cdr)
+TAO::Out_Basic_Argument_T<S, Insert_Policy>::demarshal (TAO_InputCDR & cdr)
 {
   return cdr >> this->x_;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 void
-TAO::Out_Basic_Argument_T<S>::interceptor_param (Dynamic::Parameter & p)
+TAO::Out_Basic_Argument_T<S, Insert_Policy>::interceptor_value (CORBA::Any *any) const
 {
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_OUT;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ============================================================
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 CORBA::Boolean
-TAO::Ret_Basic_Argument_T<S>::demarshal (TAO_InputCDR & cdr)
+TAO::Ret_Basic_Argument_T<S, Insert_Policy>::demarshal (TAO_InputCDR & cdr)
 {
   return cdr >> this->x_;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 void
-TAO::Ret_Basic_Argument_T<S>::interceptor_result (CORBA::Any * any)
+TAO::Ret_Basic_Argument_T<S, Insert_Policy>::interceptor_value (CORBA::Any *any) const
 {
-  (*any) <<= this->x_;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
diff --git a/TAO/tao/Basic_Argument_T.h b/TAO/tao/Basic_Argument_T.h
index e1586de690a..cc7bcb388b3 100644
--- a/TAO/tao/Basic_Argument_T.h
+++ b/TAO/tao/Basic_Argument_T.h
@@ -29,16 +29,23 @@ namespace TAO
    *
    * @brief Template class for IN stub argument of basic IDL types.
    *
+   * @todo
+   * We really would have liked to write the code as following but MSVC6 chokes
+   * on this, so we can only do this after x.5.1 has been dropped.
+   *
+   * template <typename S, template <typename T> class Insert_Policy>
+   * class In_Basic_Argument_T : public InArgument, private Insert_Policy <S>
+   * { .. };
    */
-  template<typename S>
-  class In_Basic_Argument_T : public Argument
+  template<typename S, typename Insert_Policy>
+  class In_Basic_Argument_T : public InArgument, private Insert_Policy
   {
   public:
     In_Basic_Argument_T (S const & x);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S arg (void) const;
 
@@ -52,16 +59,16 @@ namespace TAO
    * @brief Template class for INOUT stub argument of basic IDL types.
    *
    */
-  template<typename S>
-  class Inout_Basic_Argument_T : public Argument
+  template<typename S, typename Insert_Policy>
+  class Inout_Basic_Argument_T : public InoutArgument, private Insert_Policy
   {
   public:
     Inout_Basic_Argument_T (S & x);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S & arg (void);
 
@@ -75,15 +82,15 @@ namespace TAO
    * @brief Template class for OUT stub argument of basic IDL types.
    *
    */
-  template<typename S>
-  class Out_Basic_Argument_T : public Argument
+  template<typename S, typename Insert_Policy>
+  class Out_Basic_Argument_T : public OutArgument, private Insert_Policy
   {
   public:
     Out_Basic_Argument_T (S & x);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S & arg (void);
 
@@ -97,15 +104,15 @@ namespace TAO
    * @brief Template class for return stub value of basic IDL types.
    *
    */
-  template<typename S>
-  class Ret_Basic_Argument_T : public Argument
+  template<typename S, typename Insert_Policy>
+  class Ret_Basic_Argument_T : public RetArgument, private Insert_Policy
   {
   public:
     Ret_Basic_Argument_T (void);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_result (CORBA::Any *);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S & arg (void);
 
@@ -130,20 +137,20 @@ namespace TAO
    * @brief Template class for stub argument traits of basic IDL types.
    *
    */
-  template<typename T>
+  template<typename T, typename Insert_Policy>
   struct Basic_Arg_Traits_T
   {
-    typedef T                           ret_type;
-    typedef T                           in_type;
-    typedef T &                         inout_type;
-    typedef T &                         out_type;
+    typedef T                                          ret_type;
+    typedef T                                          in_type;
+    typedef T &                                        inout_type;
+    typedef T &                                        out_type;
 
-    typedef In_Basic_Argument_T<T>      in_arg_val;
-    typedef Inout_Basic_Argument_T<T>   inout_arg_val;
-    typedef Out_Basic_Argument_T<T>     out_arg_val;
-    typedef Ret_Basic_Argument_T<T>     ret_val;
+    typedef In_Basic_Argument_T<T, Insert_Policy>      in_arg_val;
+    typedef Inout_Basic_Argument_T<T, Insert_Policy>   inout_arg_val;
+    typedef Out_Basic_Argument_T<T, Insert_Policy>     out_arg_val;
+    typedef Ret_Basic_Argument_T<T, Insert_Policy>     ret_val;
 
-    typedef Basic_Tag                   idl_tag;
+    typedef Basic_Tag                                  idl_tag;
   };
 }
 
diff --git a/TAO/tao/Basic_Argument_T.inl b/TAO/tao/Basic_Argument_T.inl
index 423792367a6..d11f01533bd 100644
--- a/TAO/tao/Basic_Argument_T.inl
+++ b/TAO/tao/Basic_Argument_T.inl
@@ -1,79 +1,79 @@
 // $Id$
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 ACE_INLINE
-TAO::In_Basic_Argument_T<S>::In_Basic_Argument_T (S const & x)
+TAO::In_Basic_Argument_T<S, Insert_Policy>::In_Basic_Argument_T (S const & x)
   : x_ (x)
 {}
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 ACE_INLINE
-S 
-TAO::In_Basic_Argument_T<S>::arg (void) const
+S
+TAO::In_Basic_Argument_T<S, Insert_Policy>::arg (void) const
 {
   return this->x_;
 }
 
 // ================================================================
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 ACE_INLINE
-TAO::Inout_Basic_Argument_T<S>::Inout_Basic_Argument_T (S & x)
+TAO::Inout_Basic_Argument_T<S, Insert_Policy>::Inout_Basic_Argument_T (S & x)
   : x_ (x)
 {}
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 ACE_INLINE
 S &
-TAO::Inout_Basic_Argument_T<S>::arg (void)
+TAO::Inout_Basic_Argument_T<S, Insert_Policy>::arg (void)
 {
   return this->x_;
 }
 
 // ================================================================
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 ACE_INLINE
-TAO::Out_Basic_Argument_T<S>::Out_Basic_Argument_T (S & x)
+TAO::Out_Basic_Argument_T<S, Insert_Policy>::Out_Basic_Argument_T (S & x)
   : x_ (x)
 {}
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 ACE_INLINE
 S &
-TAO::Out_Basic_Argument_T<S>::arg (void)
+TAO::Out_Basic_Argument_T<S, Insert_Policy>::arg (void)
 {
   return this->x_;
 }
 
 // ================================================================
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 ACE_INLINE
-TAO::Ret_Basic_Argument_T<S>::Ret_Basic_Argument_T (void)
+TAO::Ret_Basic_Argument_T<S, Insert_Policy>::Ret_Basic_Argument_T (void)
 {
 }
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 ACE_INLINE
 S &
-TAO::Ret_Basic_Argument_T<S>::arg (void)
+TAO::Ret_Basic_Argument_T<S, Insert_Policy>::arg (void)
 {
   return this->x_;
 }
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 ACE_INLINE
 S
-TAO::Ret_Basic_Argument_T<S>::excp (void)
+TAO::Ret_Basic_Argument_T<S, Insert_Policy>::excp (void)
 {
   return this->x_;
 }
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 ACE_INLINE
 S
-TAO::Ret_Basic_Argument_T<S>::retn (void)
+TAO::Ret_Basic_Argument_T<S, Insert_Policy>::retn (void)
 {
   return this->x_;
 }
diff --git a/TAO/tao/Basic_Arguments.h b/TAO/tao/Basic_Arguments.h
index 7b7a65cb305..155d66c651e 100644
--- a/TAO/tao/Basic_Arguments.h
+++ b/TAO/tao/Basic_Arguments.h
@@ -23,6 +23,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/Arg_Traits_T.h"
+#include "tao/Any_Insert_Policy_T.h"
 
 namespace TAO
 {
@@ -37,7 +38,7 @@ namespace TAO
     public:
     typedef void        ret_type;
 
-    typedef Argument    ret_val;
+    typedef RetArgument ret_val;
 
     typedef Basic_Tag   idl_tag;
   };
@@ -51,55 +52,57 @@ namespace TAO
 
   template<>
   class TAO_Export Arg_Traits<CORBA::Short>
-    : public Basic_Arg_Traits_T<CORBA::Short>
+    : public Basic_Arg_Traits_T<CORBA::Short, TAO::Any_Insert_Policy_AnyTypeCode_Adapter <CORBA::Short> >
   {
   };
 
   template<>
   class TAO_Export Arg_Traits<CORBA::Long>
-    : public Basic_Arg_Traits_T<CORBA::Long>
+    : public Basic_Arg_Traits_T<CORBA::Long, TAO::Any_Insert_Policy_AnyTypeCode_Adapter <CORBA::Long> >
   {
   };
 
   template<>
   class TAO_Export Arg_Traits<CORBA::UShort>
-    : public Basic_Arg_Traits_T<CORBA::UShort>
+    : public Basic_Arg_Traits_T<CORBA::UShort, TAO::Any_Insert_Policy_Stream <CORBA::UShort> >
   {
   };
 
   template<>
   class TAO_Export Arg_Traits<CORBA::ULong>
-    : public Basic_Arg_Traits_T<CORBA::ULong>
+    : public Basic_Arg_Traits_T<CORBA::ULong, TAO::Any_Insert_Policy_AnyTypeCode_Adapter <CORBA::ULong> >
   {
   };
 
   template<>
   class TAO_Export Arg_Traits<CORBA::Float>
-    : public Basic_Arg_Traits_T<CORBA::Float>
+    : public Basic_Arg_Traits_T<CORBA::Float, TAO::Any_Insert_Policy_Stream <CORBA::Float> >
   {
   };
 
   template<>
   class TAO_Export Arg_Traits<CORBA::Double>
-    : public Basic_Arg_Traits_T<CORBA::Double>
+    : public Basic_Arg_Traits_T<CORBA::Double, TAO::Any_Insert_Policy_Stream <CORBA::Double> >
   {
   };
 
   template<>
   class TAO_Export Arg_Traits<CORBA::LongLong>
-    : public Basic_Arg_Traits_T<CORBA::LongLong>
+    : public Basic_Arg_Traits_T<CORBA::LongLong, TAO::Any_Insert_Policy_Stream <CORBA::LongLong> >
   {
   };
 
   template<>
   class TAO_Export Arg_Traits<CORBA::ULongLong>
-    : public Basic_Arg_Traits_T<CORBA::ULongLong>
+    : public Basic_Arg_Traits_T<CORBA::ULongLong,
+                                TAO::Any_Insert_Policy_Stream <CORBA::ULongLong> >
   {
   };
 
   template<>
   class TAO_Export Arg_Traits<CORBA::LongDouble>
-    : public Basic_Arg_Traits_T<CORBA::LongDouble>
+    : public Basic_Arg_Traits_T<CORBA::LongDouble,
+                                TAO::Any_Insert_Policy_Stream <CORBA::LongDouble> >
   {
   };
 }
diff --git a/TAO/tao/BiDir_GIOP.mpc b/TAO/tao/BiDir_GIOP.mpc
index c503b33a21f..9e29e3b6e2b 100644
--- a/TAO/tao/BiDir_GIOP.mpc
+++ b/TAO/tao/BiDir_GIOP.mpc
@@ -27,6 +27,9 @@ project : taolib, core, pi {
     BiDir_GIOP
   }
 
+  IDL_Files {
+  }
+
   Pkgconfig_Files {
     BiDir_GIOP/TAO_BiDirGIOP.pc.in
   }
diff --git a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp
index 65e88904bba..248691a541a 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp
@@ -3,7 +3,7 @@
 #include "BiDir_Policy_i.h"
 
 #include "tao/ORB_Constants.h"
-#include "tao/Any.h"
+#include "tao/AnyTypeCode/Any.h"
 
 ACE_RCSID (BiDir_GIOP,
            BiDir_PolicyFactory,
diff --git a/TAO/tao/Block_Flushing_Strategy.h b/TAO/tao/Block_Flushing_Strategy.h
index dac5ac3f781..4c917bc2671 100644
--- a/TAO/tao/Block_Flushing_Strategy.h
+++ b/TAO/tao/Block_Flushing_Strategy.h
@@ -25,7 +25,7 @@
  *
  * @brief Implement a flushing strategy that blocks on write to flush
  */
-class TAO_Export TAO_Block_Flushing_Strategy : public TAO_Flushing_Strategy
+class TAO_Block_Flushing_Strategy : public TAO_Flushing_Strategy
 {
 public:
   virtual int schedule_output (TAO_Transport *transport);
diff --git a/TAO/tao/BooleanSeqA.cpp b/TAO/tao/BooleanSeqA.cpp
deleted file mode 100644
index 8cef36af73b..00000000000
--- a/TAO/tao/BooleanSeqA.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-// -*- 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/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "BooleanSeqC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_CORBA_BooleanSeq_GUARD
-#define _TAO_TYPECODE_CORBA_BooleanSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_BooleanSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_boolean,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_BooleanSeq_0 =
-      &CORBA_BooleanSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_BooleanSeq_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_BooleanSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/BooleanSeq:1.0",
-    "BooleanSeq",
-    &TAO::TypeCode::tc_CORBA_BooleanSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_BooleanSeq =
-    &_tao_tc_CORBA_BooleanSeq;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::BooleanSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::BooleanSeq>::insert_copy (
-      _tao_any,
-      CORBA::BooleanSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_BooleanSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::BooleanSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::BooleanSeq>::insert (
-      _tao_any,
-      CORBA::BooleanSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_BooleanSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::BooleanSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::BooleanSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::BooleanSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::BooleanSeq>::extract (
-        _tao_any,
-        CORBA::BooleanSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_BooleanSeq_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/BooleanSeqC.cpp b/TAO/tao/BooleanSeqC.cpp
index 60a12b01952..1b7bfee2986 100644
--- a/TAO/tao/BooleanSeqC.cpp
+++ b/TAO/tao/BooleanSeqC.cpp
@@ -26,16 +26,12 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
 #include "BooleanSeqC.h"
 #include "tao/CDR.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
diff --git a/TAO/tao/BooleanSeqC.h b/TAO/tao/BooleanSeqC.h
index 138394c2bf4..9f3714cabeb 100644
--- a/TAO/tao/BooleanSeqC.h
+++ b/TAO/tao/BooleanSeqC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_BOOLEANSEQC_H_
-#define _TAO_IDL_ORIG_BOOLEANSEQC_H_
+#ifndef _TAO_IDL_BOOLEANSEQC_H_
+#define _TAO_IDL_BOOLEANSEQC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -52,17 +52,8 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#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
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace CORBA
 {
@@ -114,14 +105,9 @@ namespace CORBA
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_BooleanSeq;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module CORBA
 
@@ -134,14 +120,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::BooleanSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::BooleanSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::BooleanSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::BooleanSeq *&);
-
-// TAO_IDL - Generated from
 // be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_CORBA_BooleanSeq_H_
@@ -159,15 +137,7 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_BooleanSeq_H_ */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+// be\be_codegen.cpp:1028
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/Bounds.pidl b/TAO/tao/Bounds.pidl
deleted file mode 100644
index c639e285fe5..00000000000
--- a/TAO/tao/Bounds.pidl
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * @file Bounds.pidl
- *
- * $Id$
- *
- * @brief Pre-compiled IDL source for the CORBA::Bounds
- * exception.
- *
- * This file is used to generate BoundsC.{h,inl,cpp}, using the
- * following command:
- *
- *   tao_idl
- *        -o orig -Ge 1 -GA -Sc -Sci
- *        -Wb,export_macro=TAO_Export
- *        -Wb,export_include=TAO_Export.h
- *        -Wb,pre_include="ace/pre.h"
- *        -Wb,post_include="ace/post.h"
- *        Bounds.pidl
- *
- * and then:
- *
- * cp orig/BoundsC.{h,cpp} .
- *
- */
-#ifndef TAO_CORBA_BOUNDS_PIDL
-#define TAO_CORBA_BOUNDS_PIDL
-
-#pragma prefix "omg.org"
-
-module CORBA
-{
-  /**
-   * @exception Bounds
-   *
-   * @brief UserException for NVList::item()
-   *
-   * This exception is thrown on attempts to access 'out of bounds'
-   * items in an NVList.
-   */
-  exception Bounds {};
-};
-
-#endif /* TAO_CORBA_BOUNDS_PIDL */
diff --git a/TAO/tao/BoundsA.cpp b/TAO/tao/BoundsA.cpp
deleted file mode 100644
index ba6d1c0711d..00000000000
--- a/TAO/tao/BoundsA.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
-// -*- 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/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "BoundsC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_CORBA_Bounds = 0;
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_Bounds (
-    CORBA::tk_except,
-    "IDL:omg.org/CORBA/Bounds:1.0",
-    "Bounds",
-    _tao_fields_CORBA_Bounds,
-    0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_Bounds =
-    &_tao_tc_CORBA_Bounds;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<CORBA::Bounds>::demarshal_value (
-      TAO_InputCDR & cdr
-    )
-  {
-    CORBA::String_var id;
-    
-    if (!(cdr >> id.out ()))
-      {
-        return false;
-      }
-    
-    ACE_TRY_NEW_ENV
-      {
-        this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-      }
-    ACE_CATCHANY
-      {
-        return false;
-      }
-    ACE_ENDTRY;
-    
-    return true;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::Bounds &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::Bounds>::insert_copy (
-      _tao_any,
-      CORBA::Bounds::_tao_any_destructor,
-      CORBA::_tc_Bounds,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::Bounds *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::Bounds>::insert (
-      _tao_any,
-      CORBA::Bounds::_tao_any_destructor,
-      CORBA::_tc_Bounds,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::Bounds *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::Bounds *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::Bounds *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::Bounds>::extract (
-        _tao_any,
-        CORBA::Bounds::_tao_any_destructor,
-        CORBA::_tc_Bounds,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/BoundsC.cpp b/TAO/tao/BoundsC.cpp
deleted file mode 100644
index afc9e083f0d..00000000000
--- a/TAO/tao/BoundsC.cpp
+++ /dev/null
@@ -1,173 +0,0 @@
-// -*- 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/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "BoundsC.h"
-#include "tao/CDR.h"
-#include "tao/SystemException.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:70
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_exception/exception_cs.cpp:63
-
-CORBA::Bounds::Bounds (void)
-  : CORBA::UserException (
-        "IDL:omg.org/CORBA/Bounds:1.0",
-        "Bounds"
-      )
-{
-}
-
-CORBA::Bounds::~Bounds (void)
-{
-}
-
-CORBA::Bounds::Bounds (const ::CORBA::Bounds &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-}
-
-CORBA::Bounds&
-CORBA::Bounds::operator= (const ::CORBA::Bounds &_tao_excp)
-{
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-  return *this;
-}
-
-void CORBA::Bounds::_tao_any_destructor (void *_tao_void_pointer)
-{
-  Bounds *_tao_tmp_pointer =
-    static_cast<Bounds *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-CORBA::Bounds *
-CORBA::Bounds::_downcast (CORBA::Exception *_tao_excp)
-{
-  return dynamic_cast<Bounds *> (_tao_excp);
-}
-
-const CORBA::Bounds *
-CORBA::Bounds::_downcast (CORBA::Exception const *_tao_excp)
-{
-  return dynamic_cast<const Bounds *> (_tao_excp);
-}
-
-CORBA::Exception *CORBA::Bounds::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::CORBA::Bounds, 0);
-  return retval;
-}
-
-CORBA::Exception *
-CORBA::Bounds::_tao_duplicate (void) const
-{
-  CORBA::Exception *result = 0;
-  ACE_NEW_RETURN (
-      result,
-      ::CORBA::Bounds (*this),
-      0
-    );
-  return result;
-}
-
-void CORBA::Bounds::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void CORBA::Bounds::_tao_encode (
-    TAO_OutputCDR &cdr
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  if (cdr << *this)
-    {
-      return;
-    }
-  
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void CORBA::Bounds::_tao_decode (
-    TAO_InputCDR &cdr
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (cdr >> *this)
-    {
-      return;
-    }
-  
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr CORBA::Bounds::_tao_type (void) const
-{
-  return ::CORBA::_tc_Bounds;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/cdr_op_cs.cpp:60
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::Bounds &_tao_aggregate
-  )
-{
-  // Marshal the repository ID.
-  return (strm << _tao_aggregate._rep_id ());
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::Bounds&
-  )
-{
-  return true;
-}
diff --git a/TAO/tao/BoundsC.h b/TAO/tao/BoundsC.h
deleted file mode 100644
index 25799fb8fa0..00000000000
--- a/TAO/tao/BoundsC.h
+++ /dev/null
@@ -1,159 +0,0 @@
-// -*- 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/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_BOUNDSC_H_
-#define _TAO_IDL_ORIG_BOUNDSC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#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
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace CORBA
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_exception/exception_ch.cpp:53
-
-#if !defined (_CORBA_BOUNDS_CH_)
-#define _CORBA_BOUNDS_CH_
-  
-  class TAO_Export Bounds : public CORBA::UserException
-  {
-  public:
-    
-    Bounds (void);
-    Bounds (const Bounds &);
-    ~Bounds (void);
-
-    Bounds &operator= (const Bounds &);
-    
-    static void _tao_any_destructor (void *);
-    
-    static Bounds *_downcast (CORBA::Exception *);
-    static const Bounds *_downcast (CORBA::Exception const *);
-    
-    static CORBA::Exception *_alloc (void);
-    
-    virtual CORBA::Exception *_tao_duplicate (void) const;
-
-    virtual void _raise (void) const;
-
-    virtual void _tao_encode (
-        TAO_OutputCDR &
-        ACE_ENV_ARG_DECL
-      ) const;
-    
-    virtual void _tao_decode (
-        TAO_InputCDR &
-        ACE_ENV_ARG_DECL
-      );
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:129
-    
-    virtual CORBA::TypeCode_ptr _tao_type (void) const;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_Bounds;
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module CORBA
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// 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
-// 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
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#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/Buffering_Constraint_Policy.cpp b/TAO/tao/Buffering_Constraint_Policy.cpp
index dc11eeedd16..f3e97bfc0d3 100644
--- a/TAO/tao/Buffering_Constraint_Policy.cpp
+++ b/TAO/tao/Buffering_Constraint_Policy.cpp
@@ -1,6 +1,5 @@
 // $Id$
 
-
 #include "tao/Buffering_Constraint_Policy.h"
 
 #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
@@ -45,24 +44,6 @@ TAO_Buffering_Constraint_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   return TAO::BUFFERING_CONSTRAINT_POLICY_TYPE;
 }
 
-CORBA::Policy_ptr
-TAO_Buffering_Constraint_Policy::create (const CORBA::Any& val
-                                         ACE_ENV_ARG_DECL)
-{
-  TAO::BufferingConstraint *buffering_constraint;
-  if ((val >>= buffering_constraint) == 0)
-    ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE),
-                      CORBA::Policy::_nil ());
-
-  TAO_Buffering_Constraint_Policy *servant = 0;
-  ACE_NEW_THROW_EX (servant,
-                    TAO_Buffering_Constraint_Policy (*buffering_constraint),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  return servant;
-}
-
 TAO_Buffering_Constraint_Policy *
 TAO_Buffering_Constraint_Policy::clone (void) const
 {
@@ -105,10 +86,4 @@ TAO_Buffering_Constraint_Policy::_tao_cached_type (void) const
   return TAO_CACHED_POLICY_BUFFERING_CONSTRAINT;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 #endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
diff --git a/TAO/tao/Buffering_Constraint_Policy.h b/TAO/tao/Buffering_Constraint_Policy.h
index 3dd23fc37a2..d94271eeca4 100644
--- a/TAO/tao/Buffering_Constraint_Policy.h
+++ b/TAO/tao/Buffering_Constraint_Policy.h
@@ -48,10 +48,6 @@ public:
   /// Copy constructor.
   TAO_Buffering_Constraint_Policy (const TAO_Buffering_Constraint_Policy &rhs);
 
-  /// Helper method for the implementation of CORBA::ORB::create_policy.
-  static CORBA::Policy_ptr create (const CORBA::Any& val
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
   /// Returns a copy of <this>.
   virtual TAO_Buffering_Constraint_Policy *clone (void) const;
 
diff --git a/TAO/tao/CONV_FRAMEA.cpp b/TAO/tao/CONV_FRAMEA.cpp
deleted file mode 100644
index 48998fffc69..00000000000
--- a/TAO/tao/CONV_FRAMEA.cpp
+++ /dev/null
@@ -1,428 +0,0 @@
-// -*- 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/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "CONV_FRAMEC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/Recursive_Type_TypeCode.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CONV_FRAME_CodeSetId (
-    CORBA::tk_alias,
-    "IDL:omg.org/CONV_FRAME/CodeSetId:1.0",
-    "CodeSetId",
-    &CORBA::_tc_ulong);
-  
-namespace CONV_FRAME
-{
-  ::CORBA::TypeCode_ptr const _tc_CodeSetId =
-    &_tao_tc_CONV_FRAME_CodeSetId;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_CONV_FRAME_CodeSetIdSeq_GUARD
-#define _TAO_TYPECODE_CONV_FRAME_CodeSetIdSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CONV_FRAME_CodeSetIdSeq_0 (
-        CORBA::tk_sequence,
-        &CONV_FRAME::_tc_CodeSetId,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CONV_FRAME_CodeSetIdSeq_0 =
-      &CONV_FRAME_CodeSetIdSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CONV_FRAME_CodeSetIdSeq_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CONV_FRAME_CodeSetIdSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CONV_FRAME/CodeSetIdSeq:1.0",
-    "CodeSetIdSeq",
-    &TAO::TypeCode::tc_CONV_FRAME_CodeSetIdSeq_0);
-  
-namespace CONV_FRAME
-{
-  ::CORBA::TypeCode_ptr const _tc_CodeSetIdSeq =
-    &_tao_tc_CONV_FRAME_CodeSetIdSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CONV_FRAME_CodeSetComponent[] =
-  {
-    { "native_code_set", &CONV_FRAME::_tc_CodeSetId },
-    { "conversion_code_sets", &CONV_FRAME::_tc_CodeSetIdSeq }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_CONV_FRAME_CodeSetComponent (
-    CORBA::tk_struct,
-    "IDL:omg.org/CONV_FRAME/CodeSetComponent:1.0",
-    "CodeSetComponent",
-    _tao_fields_CONV_FRAME_CodeSetComponent,
-    2);
-  
-namespace CONV_FRAME
-{
-  ::CORBA::TypeCode_ptr const _tc_CodeSetComponent =
-    &_tao_tc_CONV_FRAME_CodeSetComponent;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CONV_FRAME_CodeSetComponentInfo[] =
-  {
-    { "ForCharData", &CONV_FRAME::_tc_CodeSetComponent },
-    { "ForWcharData", &CONV_FRAME::_tc_CodeSetComponent }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_CONV_FRAME_CodeSetComponentInfo (
-    CORBA::tk_struct,
-    "IDL:omg.org/CONV_FRAME/CodeSetComponentInfo:1.0",
-    "CodeSetComponentInfo",
-    _tao_fields_CONV_FRAME_CodeSetComponentInfo,
-    2);
-  
-namespace CONV_FRAME
-{
-  ::CORBA::TypeCode_ptr const _tc_CodeSetComponentInfo =
-    &_tao_tc_CONV_FRAME_CodeSetComponentInfo;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CONV_FRAME_CodeSetContext[] =
-  {
-    { "char_data", &CONV_FRAME::_tc_CodeSetId },
-    { "wchar_data", &CONV_FRAME::_tc_CodeSetId }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_CONV_FRAME_CodeSetContext (
-    CORBA::tk_struct,
-    "IDL:omg.org/CONV_FRAME/CodeSetContext:1.0",
-    "CodeSetContext",
-    _tao_fields_CONV_FRAME_CodeSetContext,
-    2);
-  
-namespace CONV_FRAME
-{
-  ::CORBA::TypeCode_ptr const _tc_CodeSetContext =
-    &_tao_tc_CONV_FRAME_CodeSetContext;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CONV_FRAME::CodeSetIdSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetIdSeq>::insert_copy (
-      _tao_any,
-      CONV_FRAME::CodeSetIdSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CONV_FRAME_CodeSetIdSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CONV_FRAME::CodeSetIdSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetIdSeq>::insert (
-      _tao_any,
-      CONV_FRAME::CodeSetIdSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CONV_FRAME_CodeSetIdSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CONV_FRAME::CodeSetIdSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CONV_FRAME::CodeSetIdSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CONV_FRAME::CodeSetIdSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetIdSeq>::extract (
-        _tao_any,
-        CONV_FRAME::CodeSetIdSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CONV_FRAME_CodeSetIdSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// 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_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CONV_FRAME::CodeSetComponent *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetComponent>::insert (
-      _tao_any,
-      CONV_FRAME::CodeSetComponent::_tao_any_destructor,
-      CONV_FRAME::_tc_CodeSetComponent,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CONV_FRAME::CodeSetComponent *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CONV_FRAME::CodeSetComponent *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CONV_FRAME::CodeSetComponent *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetComponent>::extract (
-        _tao_any,
-        CONV_FRAME::CodeSetComponent::_tao_any_destructor,
-        CONV_FRAME::_tc_CodeSetComponent,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CONV_FRAME::CodeSetComponentInfo &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetComponentInfo>::insert_copy (
-      _tao_any,
-      CONV_FRAME::CodeSetComponentInfo::_tao_any_destructor,
-      CONV_FRAME::_tc_CodeSetComponentInfo,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CONV_FRAME::CodeSetComponentInfo *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetComponentInfo>::insert (
-      _tao_any,
-      CONV_FRAME::CodeSetComponentInfo::_tao_any_destructor,
-      CONV_FRAME::_tc_CodeSetComponentInfo,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CONV_FRAME::CodeSetComponentInfo *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CONV_FRAME::CodeSetComponentInfo *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CONV_FRAME::CodeSetComponentInfo *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetComponentInfo>::extract (
-        _tao_any,
-        CONV_FRAME::CodeSetComponentInfo::_tao_any_destructor,
-        CONV_FRAME::_tc_CodeSetComponentInfo,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CONV_FRAME::CodeSetContext &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetContext>::insert_copy (
-      _tao_any,
-      CONV_FRAME::CodeSetContext::_tao_any_destructor,
-      CONV_FRAME::_tc_CodeSetContext,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CONV_FRAME::CodeSetContext *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetContext>::insert (
-      _tao_any,
-      CONV_FRAME::CodeSetContext::_tao_any_destructor,
-      CONV_FRAME::_tc_CodeSetContext,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CONV_FRAME::CodeSetContext *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CONV_FRAME::CodeSetContext *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CONV_FRAME::CodeSetContext *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetContext>::extract (
-        _tao_any,
-        CONV_FRAME::CodeSetContext::_tao_any_destructor,
-        CONV_FRAME::_tc_CodeSetContext,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/CONV_FRAMEC.cpp b/TAO/tao/CONV_FRAMEC.cpp
index 883637c6b40..11d54fd3b16 100644
--- a/TAO/tao/CONV_FRAMEC.cpp
+++ b/TAO/tao/CONV_FRAMEC.cpp
@@ -26,16 +26,12 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:288
 
 
 #include "CONV_FRAMEC.h"
 #include "tao/CDR.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
@@ -58,7 +54,7 @@ CONV_FRAME::CodeSetIdSeq::CodeSetIdSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Sequence<
-        CONV_FRAME::CodeSetId
+        CodeSetId
       >
     (max)
 {}
@@ -70,7 +66,7 @@ CONV_FRAME::CodeSetIdSeq::CodeSetIdSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Sequence<
-        CONV_FRAME::CodeSetId
+        CodeSetId
       >
     (max, length, buffer, release)
 {}
@@ -79,7 +75,7 @@ CONV_FRAME::CodeSetIdSeq::CodeSetIdSeq (
     const CodeSetIdSeq &seq
   )
   : TAO_Unbounded_Sequence<
-        CONV_FRAME::CodeSetId
+        CodeSetId
       >
     (seq)
 {}
diff --git a/TAO/tao/CONV_FRAMEC.h b/TAO/tao/CONV_FRAMEC.h
index 670a6aa3237..798e0fa4261 100644
--- a/TAO/tao/CONV_FRAMEC.h
+++ b/TAO/tao/CONV_FRAMEC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_CONV_FRAMEC_H_
-#define _TAO_IDL_ORIG_CONV_FRAMEC_H_
+#ifndef _TAO_IDL_CONV_FRAMEC_H_
+#define _TAO_IDL_CONV_FRAMEC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -58,12 +58,8 @@
 #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
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace CONV_FRAME
 {
@@ -75,11 +71,6 @@ namespace CONV_FRAME
   typedef CORBA::ULong_out CodeSetId_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_CodeSetId;
-  
-  // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CONV_FRAME_CODESETIDSEQ_CH_)
@@ -128,11 +119,6 @@ namespace CONV_FRAME
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_CodeSetIdSeq;
-  
-  // TAO_IDL - Generated from
   // be\be_type.cpp:258
   
   struct CodeSetComponent;
@@ -151,7 +137,7 @@ namespace CONV_FRAME
     CodeSetComponent_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
+  // be\be_visitor_structure/structure_ch.cpp:57
   
   struct TAO_Export CodeSetComponent
   {
@@ -163,11 +149,6 @@ namespace CONV_FRAME
   };
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_CodeSetComponent;
-  
-  // TAO_IDL - Generated from
   // be\be_type.cpp:258
   
   struct CodeSetComponentInfo;
@@ -186,7 +167,7 @@ namespace CONV_FRAME
     CodeSetComponentInfo_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
+  // be\be_visitor_structure/structure_ch.cpp:57
   
   struct TAO_Export CodeSetComponentInfo
   {
@@ -198,11 +179,6 @@ namespace CONV_FRAME
   };
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_CodeSetComponentInfo;
-  
-  // TAO_IDL - Generated from
   // be\be_type.cpp:258
   
   struct CodeSetContext;
@@ -218,7 +194,7 @@ namespace CONV_FRAME
     CodeSetContext_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
+  // be\be_visitor_structure/structure_ch.cpp:57
   
   struct TAO_Export CodeSetContext
   {
@@ -228,14 +204,9 @@ namespace CONV_FRAME
     CONV_FRAME::CodeSetId char_data;
     CONV_FRAME::CodeSetId wchar_data;
   };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_CodeSetContext;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module CONV_FRAME
 
@@ -248,38 +219,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CONV_FRAME::CodeSetIdSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CONV_FRAME::CodeSetIdSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CONV_FRAME::CodeSetIdSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CONV_FRAME::CodeSetIdSeq *&);
-
-// TAO_IDL - Generated from
-// 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
-// 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
-// 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
 // be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_CONV_FRAME_CodeSetIdSeq_H_
@@ -315,16 +254,12 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CONV_FRAME::CodeSet
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CONV_FRAME::CodeSetContext &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
+// be\be_codegen.cpp:1062
 
 #if defined(_MSC_VER)
 #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/CORBANAME_Parser.cpp b/TAO/tao/CORBANAME_Parser.cpp
index 57f56cc723a..649edfb1408 100644
--- a/TAO/tao/CORBANAME_Parser.cpp
+++ b/TAO/tao/CORBANAME_Parser.cpp
@@ -168,8 +168,3 @@ ACE_STATIC_SVC_DEFINE (TAO_CORBANAME_Parser,
 
 ACE_FACTORY_DEFINE (TAO, TAO_CORBANAME_Parser)
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/CORBA_methods.h b/TAO/tao/CORBA_methods.h
index df252c7cba5..038f912b6e2 100644
--- a/TAO/tao/CORBA_methods.h
+++ b/TAO/tao/CORBA_methods.h
@@ -38,21 +38,12 @@ namespace CORBA
   class Environment;
   typedef Environment *Environment_ptr;
 
-  class NamedValue;
-  typedef NamedValue *NamedValue_ptr;
-
-  class NVList;
-  typedef NVList *NVList_ptr;
-
   class Object;
   typedef Object *Object_ptr;
 
   class Principal;
   typedef Principal *Principal_ptr;
 
-  class TypeCode;
-  typedef TypeCode *TypeCode_ptr;
-
   class OperationDef;
   typedef OperationDef *OperationDef_ptr;
 
@@ -76,12 +67,6 @@ namespace CORBA
   TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (Environment_ptr);
   TAO_NAMESPACE_INLINE_FUNCTION void release (Environment_ptr);
 
-  TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (NamedValue_ptr);
-  TAO_NAMESPACE_INLINE_FUNCTION void release (NamedValue_ptr);
-
-  TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (NVList_ptr);
-  TAO_NAMESPACE_INLINE_FUNCTION void release (NVList_ptr);
-
   TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (ORB_ptr);
   TAO_NAMESPACE_INLINE_FUNCTION void release (ORB_ptr);
 
@@ -90,9 +75,6 @@ namespace CORBA
 
   TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (Principal_ptr);
   TAO_NAMESPACE_INLINE_FUNCTION void release (Principal_ptr);
-
-  TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (TypeCode_ptr);
-  TAO_NAMESPACE_INLINE_FUNCTION void release (TypeCode_ptr);
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Cache_Entries.h b/TAO/tao/Cache_Entries.h
index 7987f7def4f..eea2967b2fc 100644
--- a/TAO/tao/Cache_Entries.h
+++ b/TAO/tao/Cache_Entries.h
@@ -165,11 +165,8 @@ namespace TAO
     /// Make a deep copy of the underlying pointer
     void duplicate (void);
 
-    //@{
     /// Return the index value
-    CORBA::ULong index (void);
     CORBA::ULong index (void) const;
-    //@}
 
     /// Set the index value. This calls should not be used by any users
     /// but for the TAO_Transport_Cache_Manager class.
diff --git a/TAO/tao/Cache_Entries.inl b/TAO/tao/Cache_Entries.inl
index 0b34beb193a..711f635b20e 100644
--- a/TAO/tao/Cache_Entries.inl
+++ b/TAO/tao/Cache_Entries.inl
@@ -164,12 +164,6 @@ namespace TAO
 
 
   ACE_INLINE CORBA::ULong
-  Cache_ExtId::index (void)
-  {
-    return this->index_;
-  }
-
-  ACE_INLINE CORBA::ULong
   Cache_ExtId::index (void) const
   {
     return this->index_;
diff --git a/TAO/tao/CharSeqA.cpp b/TAO/tao/CharSeqA.cpp
deleted file mode 100644
index 734fda6bb86..00000000000
--- a/TAO/tao/CharSeqA.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-// -*- 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/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "CharSeqC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_CORBA_CharSeq_GUARD
-#define _TAO_TYPECODE_CORBA_CharSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_CharSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_char,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_CharSeq_0 =
-      &CORBA_CharSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_CharSeq_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_CharSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/CharSeq:1.0",
-    "CharSeq",
-    &TAO::TypeCode::tc_CORBA_CharSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_CharSeq =
-    &_tao_tc_CORBA_CharSeq;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::CharSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::CharSeq>::insert_copy (
-      _tao_any,
-      CORBA::CharSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_CharSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::CharSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::CharSeq>::insert (
-      _tao_any,
-      CORBA::CharSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_CharSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::CharSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::CharSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::CharSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::CharSeq>::extract (
-        _tao_any,
-        CORBA::CharSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_CharSeq_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/CharSeqC.h b/TAO/tao/CharSeqC.h
index dc9b8949bbb..092e235c744 100644
--- a/TAO/tao/CharSeqC.h
+++ b/TAO/tao/CharSeqC.h
@@ -66,22 +66,22 @@
 
 namespace CORBA
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_CHARSEQ_CH_)
 #define _CORBA_CHARSEQ_CH_
-  
+
   class CharSeq;
-  
+
   typedef
     TAO_FixedSeq_Var_T<
         CharSeq,
         CORBA::Char
       >
     CharSeq_var;
-  
+
   typedef
     TAO_Seq_Out_T<
         CharSeq,
@@ -89,7 +89,7 @@ namespace CORBA
         CORBA::Char
       >
     CharSeq_out;
-  
+
   class TAO_Export CharSeq
     : public
         TAO_Unbounded_Sequence<
@@ -102,23 +102,18 @@ namespace CORBA
     CharSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        CORBA::Char* buffer, 
+        CORBA::Char* buffer,
         CORBA::Boolean release = 0
       );
     CharSeq (const CharSeq &);
     ~CharSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef CharSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_CharSeq;
 
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:66
@@ -134,14 +129,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::CharSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::CharSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::CharSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::CharSeq *&);
-
-// TAO_IDL - Generated from
 // be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_CORBA_CharSeq_H_
diff --git a/TAO/tao/CodecFactory.mpc b/TAO/tao/CodecFactory.mpc
index 0a9575ce991..2b7ba3dec89 100644
--- a/TAO/tao/CodecFactory.mpc
+++ b/TAO/tao/CodecFactory.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project : taolib, core {
+project : taolib, core, anytypecode {
   sharedname    = TAO_CodecFactory
   dynamicflags  = TAO_CODECFACTORY_BUILD_DLL
 
@@ -27,6 +27,9 @@ project : taolib, core {
     CodecFactory
   }
 
+  IDL_Files {
+  }
+
   Pkgconfig_Files {
     CodecFactory/TAO_CodecFactory.pc.in
   }
diff --git a/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp b/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp
index 35905f4fbe5..fbe180bde84 100644
--- a/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp
+++ b/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp
@@ -6,14 +6,14 @@
 
 #include "tao/CDR.h"
 #include "tao/OctetSeqC.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl.h"
-#include "tao/TypeCode.h"
-#include "tao/Marshal.h"
-#include "tao/Any_Unknown_IDL_Type.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl.h"
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/AnyTypeCode/Marshal.h"
+#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/SystemException.h"
 #include "tao/ORB_Constants.h"
-#include "tao/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
 
 #include "ace/Auto_Ptr.h"
 #include "ace/OS_NS_string.h"
diff --git a/TAO/tao/CodecFactory/IOP_CodecA.cpp b/TAO/tao/CodecFactory/IOP_CodecA.cpp
index 5c5a791f7e2..2e54165d86c 100644
--- a/TAO/tao/CodecFactory/IOP_CodecA.cpp
+++ b/TAO/tao/CodecFactory/IOP_CodecA.cpp
@@ -26,17 +26,17 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "CodecFactory.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/Recursive_Type_TypeCode.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
+#include "tao/AnyTypeCode/Recursive_Type_TypeCode.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/struct_typecode.cpp:87
@@ -52,7 +52,7 @@ static TAO::TypeCode::Struct<char const *,
     "InvalidTypeForEncoding",
     _tao_fields_IOP_Codec_InvalidTypeForEncoding,
     0);
-  
+
 ::CORBA::TypeCode_ptr const IOP::Codec::_tc_InvalidTypeForEncoding =
   &_tao_tc_IOP_Codec_InvalidTypeForEncoding;
 
@@ -70,7 +70,7 @@ static TAO::TypeCode::Struct<char const *,
     "FormatMismatch",
     _tao_fields_IOP_Codec_FormatMismatch,
     0);
-  
+
 ::CORBA::TypeCode_ptr const IOP::Codec::_tc_FormatMismatch =
   &_tao_tc_IOP_Codec_FormatMismatch;
 
@@ -88,7 +88,7 @@ static TAO::TypeCode::Struct<char const *,
     "TypeMismatch",
     _tao_fields_IOP_Codec_TypeMismatch,
     0);
-  
+
 ::CORBA::TypeCode_ptr const IOP::Codec::_tc_TypeMismatch =
   &_tao_tc_IOP_Codec_TypeMismatch;
 
@@ -101,7 +101,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/IOP/Codec:1.0",
     "Codec");
-  
+
 namespace IOP
 {
   ::CORBA::TypeCode_ptr const _tc_Codec =
@@ -121,7 +121,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/IOP/EncodingFormat:1.0",
     "EncodingFormat",
     &CORBA::_tc_short);
-  
+
 namespace IOP
 {
   ::CORBA::TypeCode_ptr const _tc_EncodingFormat =
@@ -138,7 +138,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
     { "format", &IOP::_tc_EncodingFormat },
     { "major_version", &CORBA::_tc_octet },
     { "minor_version", &CORBA::_tc_octet }
-    
+
   };
 static TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
@@ -150,7 +150,7 @@ static TAO::TypeCode::Struct<char const *,
     "Encoding",
     _tao_fields_IOP_Encoding,
     3);
-  
+
 namespace IOP
 {
   ::CORBA::TypeCode_ptr const _tc_Encoding =
@@ -173,7 +173,7 @@ static TAO::TypeCode::Struct<char const *,
     "UnknownEncoding",
     _tao_fields_IOP_CodecFactory_UnknownEncoding,
     0);
-  
+
 ::CORBA::TypeCode_ptr const IOP::CodecFactory::_tc_UnknownEncoding =
   &_tao_tc_IOP_CodecFactory_UnknownEncoding;
 
@@ -186,7 +186,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/IOP/CodecFactory:1.0",
     "CodecFactory");
-  
+
 namespace IOP
 {
   ::CORBA::TypeCode_ptr const _tc_CodecFactory =
@@ -219,7 +219,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<IOP::Codec>::demarshal_value (TAO_InputCDR &)
@@ -270,7 +270,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 namespace TAO
@@ -281,7 +281,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Dual_Impl_T<IOP::Codec::InvalidTypeForEncoding>::demarshal_value (TAO_InputCDR &)
@@ -345,7 +345,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 namespace TAO
@@ -356,7 +356,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Dual_Impl_T<IOP::Codec::FormatMismatch>::demarshal_value (TAO_InputCDR &)
@@ -420,7 +420,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 namespace TAO
@@ -431,7 +431,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Dual_Impl_T<IOP::Codec::TypeMismatch>::demarshal_value (TAO_InputCDR &)
@@ -495,7 +495,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -577,7 +577,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<IOP::CodecFactory>::demarshal_value (TAO_InputCDR &)
@@ -628,7 +628,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 namespace TAO
@@ -639,7 +639,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Dual_Impl_T<IOP::CodecFactory::UnknownEncoding>::demarshal_value (TAO_InputCDR &)
diff --git a/TAO/tao/CodecFactory/IOP_CodecC.h b/TAO/tao/CodecFactory/IOP_CodecC.h
index d17987c45bf..b0e6e594507 100644
--- a/TAO/tao/CodecFactory/IOP_CodecC.h
+++ b/TAO/tao/CodecFactory/IOP_CodecC.h
@@ -48,10 +48,10 @@
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
-#include "tao/TypeCode.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Any.h"
-#include "tao/TypeCode.h"
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/Objref_VarOut_T.h"
 #include "tao/VarOut_T.h"
 
@@ -201,14 +201,14 @@ namespace IOP
       ~FormatMismatch (void);
 
       FormatMismatch &operator= (const FormatMismatch &);
-      
+
       static void _tao_any_destructor (void *);
-      
+
       static FormatMismatch *_downcast (CORBA::Exception *);
       static const FormatMismatch *_downcast (CORBA::Exception const *);
-      
+
       static CORBA::Exception *_alloc (void);
-      
+
       virtual CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
@@ -217,48 +217,48 @@ namespace IOP
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:127
-      
+
       virtual CORBA::TypeCode_ptr _tao_type (void) const;
     };
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr const _tc_FormatMismatch;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_IOP_CODEC_TYPEMISMATCH_CH_)
 #define _IOP_CODEC_TYPEMISMATCH_CH_
-    
+
     class TAO_CodecFactory_Export TypeMismatch : public CORBA::UserException
     {
     public:
-      
+
       TypeMismatch (void);
       TypeMismatch (const TypeMismatch &);
       ~TypeMismatch (void);
 
       TypeMismatch &operator= (const TypeMismatch &);
-      
+
       static void _tao_any_destructor (void *);
-      
+
       static TypeMismatch *_downcast (CORBA::Exception *);
       static const TypeMismatch *_downcast (CORBA::Exception const *);
-      
+
       static CORBA::Exception *_alloc (void);
-      
+
       virtual CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
@@ -267,28 +267,28 @@ namespace IOP
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:127
-      
+
       virtual CORBA::TypeCode_ptr _tao_type (void) const;
     };
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr const _tc_TypeMismatch;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::OctetSeq * encode (
         const ::CORBA::Any & data
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -297,10 +297,10 @@ namespace IOP
         CORBA::SystemException,
         ::IOP::Codec::InvalidTypeForEncoding
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Any * decode (
         const ::CORBA::OctetSeq & data
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -309,10 +309,10 @@ namespace IOP
         CORBA::SystemException,
         ::IOP::Codec::FormatMismatch
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::OctetSeq * encode_value (
         const ::CORBA::Any & data
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -321,10 +321,10 @@ namespace IOP
         CORBA::SystemException,
         ::IOP::Codec::InvalidTypeForEncoding
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Any * decode_value (
         const ::CORBA::OctetSeq & data,
         ::CORBA::TypeCode_ptr tc
@@ -335,102 +335,102 @@ namespace IOP
         ::IOP::Codec::FormatMismatch,
         ::IOP::Codec::TypeMismatch
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     Codec (void);
-    
+
     virtual ~Codec (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     Codec (const Codec &);
-    
+
     void operator= (const Codec &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   extern TAO_CodecFactory_Export ::CORBA::TypeCode_ptr const _tc_Codec;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:379
-  
+
   typedef CORBA::Short EncodingFormat;
   typedef CORBA::Short_out EncodingFormat_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   extern TAO_CodecFactory_Export ::CORBA::TypeCode_ptr const _tc_EncodingFormat;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const IOP::EncodingFormat ENCODING_CDR_ENCAPS = 0;
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct Encoding;
-  
+
   typedef
     TAO_Fixed_Var_T<
         Encoding
       >
     Encoding_var;
-  
+
   typedef
     Encoding &
     Encoding_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:52
-  
+
   struct TAO_CodecFactory_Export Encoding
   {
     typedef Encoding_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     IOP::EncodingFormat format;
     CORBA::Octet major_version;
     CORBA::Octet minor_version;
   };
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   extern TAO_CodecFactory_Export ::CORBA::TypeCode_ptr const _tc_Encoding;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_IOP_CODECFACTORY__VAR_OUT_CH_)
 #define _IOP_CODECFACTORY__VAR_OUT_CH_
-  
+
   class CodecFactory;
   typedef CodecFactory *CodecFactory_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         CodecFactory
       >
     CodecFactory_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         CodecFactory
@@ -438,65 +438,65 @@ namespace IOP
     CodecFactory_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_IOP_CODECFACTORY_CH_)
 #define _IOP_CODECFACTORY_CH_
-  
+
   class TAO_CodecFactory_Export CodecFactory
     : public virtual CORBA::Object
   {
   public:
     typedef CodecFactory_ptr _ptr_type;
     typedef CodecFactory_var _var_type;
-    
+
     // The static operations.
     static CodecFactory_ptr _duplicate (CodecFactory_ptr obj);
-    
+
     static void _tao_release (CodecFactory_ptr obj);
-    
+
     static CodecFactory_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static CodecFactory_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static CodecFactory_ptr _nil (void)
     {
       return static_cast<CodecFactory_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_IOP_CODECFACTORY_UNKNOWNENCODING_CH_)
 #define _IOP_CODECFACTORY_UNKNOWNENCODING_CH_
-    
+
     class TAO_CodecFactory_Export UnknownEncoding : public CORBA::UserException
     {
     public:
-      
+
       UnknownEncoding (void);
       UnknownEncoding (const UnknownEncoding &);
       ~UnknownEncoding (void);
 
       UnknownEncoding &operator= (const UnknownEncoding &);
-      
+
       static void _tao_any_destructor (void *);
-      
+
       static UnknownEncoding *_downcast (CORBA::Exception *);
       static const UnknownEncoding *_downcast (CORBA::Exception const *);
-      
+
       static CORBA::Exception *_alloc (void);
-      
+
       virtual CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
@@ -505,28 +505,28 @@ namespace IOP
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:127
-      
+
       virtual CORBA::TypeCode_ptr _tao_type (void) const;
     };
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr const _tc_UnknownEncoding;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::IOP::Codec_ptr create_codec (
         const ::IOP::Encoding & enc
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -535,36 +535,36 @@ namespace IOP
         CORBA::SystemException,
         ::IOP::CodecFactory::UnknownEncoding
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     CodecFactory (void);
-    
+
     virtual ~CodecFactory (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     CodecFactory (const CodecFactory &);
-    
+
     void operator= (const CodecFactory &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   extern TAO_CodecFactory_Export ::CORBA::TypeCode_ptr const _tc_CodecFactory;
 
 // TAO_IDL - Generated from
@@ -581,7 +581,7 @@ namespace TAO
 
 #if !defined (_IOP_CODEC__TRAITS_CH_)
 #define _IOP_CODEC__TRAITS_CH_
-  
+
   template<>
   struct TAO_CodecFactory_Export Objref_Traits< ::IOP::Codec>
   {
@@ -602,7 +602,7 @@ namespace TAO
 
 #if !defined (_IOP_CODECFACTORY__TRAITS_CH_)
 #define _IOP_CODECFACTORY__TRAITS_CH_
-  
+
   template<>
   struct TAO_CodecFactory_Export Objref_Traits< ::IOP::CodecFactory>
   {
diff --git a/TAO/tao/CurrentA.cpp b/TAO/tao/CurrentA.cpp
deleted file mode 100644
index 1ae19a03c5c..00000000000
--- a/TAO/tao/CurrentA.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-// -*- 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/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "CurrentC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_Current (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/CORBA/Current:1.0",
-    "Current");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_Current =
-    &_tao_tc_CORBA_Current;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::Current>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::Current>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::Current>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// 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
-      );
-}
diff --git a/TAO/tao/CurrentC.cpp b/TAO/tao/CurrentC.cpp
index 80539961bd3..5b38d3dae99 100644
--- a/TAO/tao/CurrentC.cpp
+++ b/TAO/tao/CurrentC.cpp
@@ -26,17 +26,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:288
 
 
 #include "CurrentC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
@@ -88,14 +84,6 @@ CORBA::Current::Current (void)
 CORBA::Current::~Current (void)
 {}
 
-void 
-CORBA::Current::_tao_any_destructor (void *_tao_void_pointer)
-{
-  Current *_tao_tmp_pointer =
-    static_cast<Current *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
 CORBA::Current_ptr
 CORBA::Current::_narrow (
     CORBA::Object_ptr _tao_objref
diff --git a/TAO/tao/CurrentC.h b/TAO/tao/CurrentC.h
index d2d3a7e2364..e23843d6261 100644
--- a/TAO/tao/CurrentC.h
+++ b/TAO/tao/CurrentC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_CURRENTC_H_
-#define _TAO_IDL_ORIG_CURRENTC_H_
+#ifndef _TAO_IDL_CURRENTC_H_
+#define _TAO_IDL_CURRENTC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -56,12 +56,8 @@
 #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
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace CORBA
 {
@@ -122,7 +118,7 @@ namespace CORBA
       return static_cast<Current_ptr> (0);
     }
     
-    static void _tao_any_destructor (void *);
+    
     
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
@@ -149,14 +145,9 @@ namespace CORBA
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_Current;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module CORBA
 
@@ -167,8 +158,8 @@ namespace CORBA
 namespace TAO
 {
 
-#if !defined (_CORBA_CURRENT__TRAITS_CH_)
-#define _CORBA_CURRENT__TRAITS_CH_
+#if !defined (_CORBA_CURRENT__TRAITS_)
+#define _CORBA_CURRENT__TRAITS_
   
   template<>
   struct TAO_Export Objref_Traits< ::CORBA::Current>
@@ -190,23 +181,12 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// 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
-// be\be_codegen.cpp:955
+// be\be_codegen.cpp:1062
 
 #if defined(_MSC_VER)
 #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/Domain.mpc b/TAO/tao/Domain.mpc
index 6669d7e1877..d3f79463993 100644
--- a/TAO/tao/Domain.mpc
+++ b/TAO/tao/Domain.mpc
@@ -26,6 +26,9 @@ project : taolib, core, ifr_client, portableserver {
   PIDL_Files {
   }
 
+  IDL_Files {
+  }
+
   Pkgconfig_Files {
     Domain/TAO_Domain.pc.in
   }
diff --git a/TAO/tao/Domain/DomainS.cpp b/TAO/tao/Domain/DomainS.cpp
index 9135cbf5c47..cf23376b5ce 100644
--- a/TAO/tao/Domain/DomainS.cpp
+++ b/TAO/tao/Domain/DomainS.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_codegen.cpp:599
 
 #ifndef _TAO_IDL_ORIG_DOMAINS_CPP_
@@ -53,8 +53,8 @@
 #include "tao/Stub.h"
 #include "tao/IFR_Client_Adapter.h"
 #include "tao/Object_T.h"
-#include "tao/TypeCode.h"
-#include "tao/DynamicC.h"
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/AnyTypeCode/DynamicC.h"
 #include "tao/CDR.h"
 #include "tao/operation_details.h"
 #include "tao/PortableInterceptor.h"
@@ -81,14 +81,15 @@ namespace TAO
 
 #if !defined (_CORBA_POLICY__SARG_TRAITS_SS_)
 #define _CORBA_POLICY__SARG_TRAITS_SS_
-  
+
   template<>
   class  SArg_Traits<CORBA::Policy>
     : public
         Object_SArg_Traits_T<
             CORBA::Policy_ptr,
             CORBA::Policy_var,
-            CORBA::Policy_out
+            CORBA::Policy_out,
+            TAO::Any_Insert_Policy_AnyTypeCode_Adapter <CORBA::Policy_ptr>
           >
   {
   };
@@ -97,14 +98,15 @@ namespace TAO
 
 #if !defined (_CORBA_INTERFACEDEF__SARG_TRAITS_SS_)
 #define _CORBA_INTERFACEDEF__SARG_TRAITS_SS_
-  
+
   template<>
   class  SArg_Traits<CORBA::InterfaceDef>
     : public
         Object_SArg_Traits_T<
             CORBA::InterfaceDef_ptr,
             CORBA::InterfaceDef_var,
-            CORBA::InterfaceDef_out
+            CORBA::InterfaceDef_out,
+            TAO::Any_Insert_Policy_IFR_Client_Adapter <CORBA::InterfaceDef_ptr>
           >
   {
   };
@@ -122,7 +124,7 @@ namespace TAO
 
 #if !defined (_CORBA_POLICY__ARG_TRAITS_SS_)
 #define _CORBA_POLICY__ARG_TRAITS_SS_
-  
+
   template<>
   class  Arg_Traits<CORBA::Policy>
     : public
@@ -130,7 +132,8 @@ namespace TAO
             CORBA::Policy_ptr,
             CORBA::Policy_var,
             CORBA::Policy_out,
-            TAO::Objref_Traits<CORBA::Policy>
+            TAO::Objref_Traits<CORBA::Policy>,
+            TAO::Any_Insert_Policy_Stream <CORBA::Policy_ptr>
           >
   {
   };
@@ -139,7 +142,7 @@ namespace TAO
 
 #if !defined (_CORBA_INTERFACEDEF__ARG_TRAITS_SS_)
 #define _CORBA_INTERFACEDEF__ARG_TRAITS_SS_
-  
+
   template<>
   class  Arg_Traits<CORBA::InterfaceDef>
     : public
@@ -147,7 +150,8 @@ namespace TAO
             CORBA::InterfaceDef_ptr,
             CORBA::InterfaceDef_var,
             CORBA::InterfaceDef_out,
-            TAO::Objref_Traits<CORBA::InterfaceDef>
+            TAO::Objref_Traits<CORBA::InterfaceDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::InterfaceDef_ptr>
           >
   {
   };
@@ -280,7 +284,7 @@ POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker::the_TAO_DomainManager_St
 {
   static POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker
   strategized_proxy_broker;
-  
+
   return &strategized_proxy_broker;
 }
 
@@ -302,7 +306,7 @@ POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker::get_strategy (
   TAO::Collocation_Strategy strategy =
     TAO_ORB_Core::collocation_strategy (obj ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (TAO::TAO_CS_REMOTE_STRATEGY);
-  
+
   return strategy;
 }
 
@@ -321,13 +325,13 @@ POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker::dispatch (
 {
   TAO::Direct_Collocation_Upcall_Wrapper collocation_upcall_wrapper;
   collocation_upcall_wrapper.upcall (
-    obj, 
-    forward_obj, 
-    args, 
-    num_args, 
-    op, 
-    op_len, 
-    strategy 
+    obj,
+    forward_obj,
+    args,
+    num_args,
+    op,
+    op_len,
+    strategy
     ACE_ENV_ARG_PARAMETER);
 }
 
@@ -348,9 +352,9 @@ CORBA__TAO_DomainManager_Proxy_Broker_Factory_function (CORBA::Object_ptr)
 int
 CORBA__TAO_DomainManager_Proxy_Broker_Factory_Initializer (size_t)
 {
-  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;
 }
 
@@ -369,14 +373,14 @@ CORBA__TAO_DomainManager_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 POA_CORBA::_TAO_DomainManager_Direct_Proxy_Impl::_TAO_DomainManager_Direct_Proxy_Impl (void)
 {}
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_CORBA::_TAO_DomainManager_Direct_Proxy_Impl::get_domain_policy (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -398,7 +402,7 @@ POA_CORBA::_TAO_DomainManager_Direct_Proxy_Impl::get_domain_policy (
 //           End Direct Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::DomainManager::DomainManager (void)
@@ -418,11 +422,11 @@ POA_CORBA::DomainManager::~DomainManager (void)
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class get_domain_policy_DomainManager
     : public TAO::Upcall_Command
   {
@@ -436,38 +440,38 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< CORBA::Policy>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< CORBA::Policy, TAO::SArg_Traits< CORBA::Policy>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::PolicyType>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::PolicyType, TAO::SArg_Traits< ::CORBA::PolicyType>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
-      
+
+
       retval =
         this->servant_->get_domain_policy (
           arg_1
           ACE_ENV_ARG_PARAMETER);
-        
+
     }
-  
+
   private:
     POA_CORBA::DomainManager * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::DomainManager::get_domain_policy_skel (
@@ -477,24 +481,24 @@ void POA_CORBA::DomainManager::get_domain_policy_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< CORBA::Policy>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::PolicyType>::in_arg_val _tao_policy_type;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_policy_type
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::DomainManager * const impl =
     static_cast<POA_CORBA::DomainManager *> (servant);
 
@@ -502,7 +506,7 @@ void POA_CORBA::DomainManager::get_domain_policy_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -515,19 +519,19 @@ void POA_CORBA::DomainManager::get_domain_policy_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_DomainManager_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -541,68 +545,68 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
-      
+
+
       retval =
         this->servant_-> _is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
-        
+
     }
-  
+
   private:
     POA_CORBA::DomainManager * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::DomainManager::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::DomainManager * const impl =
     static_cast<POA_CORBA::DomainManager *> (servant);
-  
+
   _is_a_DomainManager_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -615,16 +619,16 @@ void POA_CORBA::DomainManager::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_DomainManager_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -638,59 +642,59 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
-      
+
+
       retval =
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
-        
+
     }
-  
+
   private:
     POA_CORBA::DomainManager * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::DomainManager::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::DomainManager * const impl =
     static_cast<POA_CORBA::DomainManager *> (servant);
-  
+
   _non_existent_DomainManager_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -703,18 +707,18 @@ void POA_CORBA::DomainManager::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:393
 
 
 
 void POA_CORBA::DomainManager::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -724,30 +728,30 @@ void POA_CORBA::DomainManager::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW (CORBA::INTF_REPOS (CORBA::OMGVMCID | 1,
                                     CORBA::COMPLETED_NO));
     }
-  
+
   POA_CORBA::DomainManager * const impl =
     static_cast<POA_CORBA::DomainManager *> (servant);
-  CORBA::InterfaceDef_ptr _tao_retval = 
+  CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -756,11 +760,11 @@ void POA_CORBA::DomainManager::_interface_skel (
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_DomainManager_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -774,59 +778,59 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
-      
+
+
       retval =
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
-        
+
     }
-  
+
   private:
     POA_CORBA::DomainManager * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::DomainManager::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::DomainManager * const impl =
     static_cast<POA_CORBA::DomainManager *> (servant);
-  
+
   _get_component_DomainManager_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -839,7 +843,7 @@ void POA_CORBA::DomainManager::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 CORBA::Boolean POA_CORBA::DomainManager::_is_a (
@@ -888,22 +892,22 @@ 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 ();
-  
+
   CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::DomainManager STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -1041,7 +1045,7 @@ POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker::the_TAO_Constructio
 {
   static POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker
   strategized_proxy_broker;
-  
+
   return &strategized_proxy_broker;
 }
 
@@ -1063,7 +1067,7 @@ POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker::get_strategy (
   TAO::Collocation_Strategy strategy =
     TAO_ORB_Core::collocation_strategy (obj ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (TAO::TAO_CS_REMOTE_STRATEGY);
-  
+
   return strategy;
 }
 
@@ -1082,13 +1086,13 @@ POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker::dispatch (
 {
   TAO::Direct_Collocation_Upcall_Wrapper collocation_upcall_wrapper;
   collocation_upcall_wrapper.upcall (
-    obj, 
-    forward_obj, 
-    args, 
-    num_args, 
-    op, 
-    op_len, 
-    strategy 
+    obj,
+    forward_obj,
+    args,
+    num_args,
+    op,
+    op_len,
+    strategy
     ACE_ENV_ARG_PARAMETER);
 }
 
@@ -1109,9 +1113,9 @@ CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function (CORBA::Object_ptr)
 int
 CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_Initializer (size_t)
 {
-  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;
 }
 
@@ -1130,14 +1134,14 @@ CORBA__TAO_ConstructionPolicy_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::_TAO_ConstructionPolicy_Direct_Proxy_Impl (void)
 {}
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::make_domain_manager (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -1159,7 +1163,7 @@ POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::make_domain_manager (
 //           End Direct Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::ConstructionPolicy::ConstructionPolicy (void)
@@ -1180,11 +1184,11 @@ POA_CORBA::ConstructionPolicy::~ConstructionPolicy (void)
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class make_domain_manager_ConstructionPolicy
     : public TAO::Upcall_Command
   {
@@ -1198,7 +1202,7 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< CORBA::InterfaceDef>::in_arg_type arg_1 =
@@ -1206,30 +1210,30 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       this->servant_->make_domain_manager (
         arg_1
         , arg_2
         ACE_ENV_ARG_PARAMETER);
-      
+
     }
-  
+
   private:
     POA_CORBA::ConstructionPolicy * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ConstructionPolicy::make_domain_manager_skel (
@@ -1239,26 +1243,26 @@ void POA_CORBA::ConstructionPolicy::make_domain_manager_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< CORBA::InterfaceDef>::in_arg_val _tao_object_type;
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_constr_policy;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_object_type,
       &_tao_constr_policy
     };
-  
+
   static size_t const nargs = 3;
-  
+
   POA_CORBA::ConstructionPolicy * const impl =
     static_cast<POA_CORBA::ConstructionPolicy *> (servant);
 
@@ -1266,7 +1270,7 @@ void POA_CORBA::ConstructionPolicy::make_domain_manager_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1279,19 +1283,19 @@ void POA_CORBA::ConstructionPolicy::make_domain_manager_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_ConstructionPolicy_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -1305,68 +1309,68 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
-      
+
+
       retval =
         this->servant_-> _is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
-        
+
     }
-  
+
   private:
     POA_CORBA::ConstructionPolicy * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::ConstructionPolicy::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ConstructionPolicy * const impl =
     static_cast<POA_CORBA::ConstructionPolicy *> (servant);
-  
+
   _is_a_ConstructionPolicy_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1379,16 +1383,16 @@ void POA_CORBA::ConstructionPolicy::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_ConstructionPolicy_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -1402,59 +1406,59 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
-      
+
+
       retval =
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
-        
+
     }
-  
+
   private:
     POA_CORBA::ConstructionPolicy * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::ConstructionPolicy::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ConstructionPolicy * const impl =
     static_cast<POA_CORBA::ConstructionPolicy *> (servant);
-  
+
   _non_existent_ConstructionPolicy_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1467,18 +1471,18 @@ void POA_CORBA::ConstructionPolicy::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:393
 
 
 
 void POA_CORBA::ConstructionPolicy::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -1488,30 +1492,30 @@ void POA_CORBA::ConstructionPolicy::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW (CORBA::INTF_REPOS (CORBA::OMGVMCID | 1,
                                     CORBA::COMPLETED_NO));
     }
-  
+
   POA_CORBA::ConstructionPolicy * const impl =
     static_cast<POA_CORBA::ConstructionPolicy *> (servant);
-  CORBA::InterfaceDef_ptr _tao_retval = 
+  CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -1520,11 +1524,11 @@ void POA_CORBA::ConstructionPolicy::_interface_skel (
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_ConstructionPolicy_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -1538,59 +1542,59 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
-      
+
+
       retval =
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
-        
+
     }
-  
+
   private:
     POA_CORBA::ConstructionPolicy * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::ConstructionPolicy::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ConstructionPolicy * const impl =
     static_cast<POA_CORBA::ConstructionPolicy *> (servant);
-  
+
   _get_component_ConstructionPolicy_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1603,7 +1607,7 @@ void POA_CORBA::ConstructionPolicy::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 CORBA::Boolean POA_CORBA::ConstructionPolicy::_is_a (
@@ -1656,22 +1660,22 @@ 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 ();
-  
+
   CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::ConstructionPolicy STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
diff --git a/TAO/tao/DomainA.cpp b/TAO/tao/DomainA.cpp
deleted file mode 100644
index 56760c9c277..00000000000
--- a/TAO/tao/DomainA.cpp
+++ /dev/null
@@ -1,296 +0,0 @@
-// -*- 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/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "DomainC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_DomainManager (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/DomainManager:1.0",
-    "DomainManager");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_DomainManager =
-    &_tao_tc_CORBA_DomainManager;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ConstructionPolicy (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ConstructionPolicy:1.0",
-    "ConstructionPolicy");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ConstructionPolicy =
-    &_tao_tc_CORBA_ConstructionPolicy;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_CORBA_DomainManagerList_GUARD
-#define _TAO_TYPECODE_CORBA_DomainManagerList_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_DomainManagerList_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_DomainManager,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_DomainManagerList_0 =
-      &CORBA_DomainManagerList_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_DomainManagerList_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_DomainManagerList (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/DomainManagerList:1.0",
-    "DomainManagerList",
-    &TAO::TypeCode::tc_CORBA_DomainManagerList_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_DomainManagerList =
-    &_tao_tc_CORBA_DomainManagerList;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::DomainManager>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::DomainManager_ptr _tao_elem
-  )
-{
-  CORBA::DomainManager_ptr _tao_objptr =
-    CORBA::DomainManager::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::DomainManager_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::DomainManager>::insert (
-      _tao_any,
-      CORBA::DomainManager::_tao_any_destructor,
-      CORBA::_tc_DomainManager,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::DomainManager_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::DomainManager>::extract (
-        _tao_any,
-        CORBA::DomainManager::_tao_any_destructor,
-        CORBA::_tc_DomainManager,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ConstructionPolicy>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ConstructionPolicy_ptr _tao_elem
-  )
-{
-  CORBA::ConstructionPolicy_ptr _tao_objptr =
-    CORBA::ConstructionPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ConstructionPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ConstructionPolicy>::insert (
-      _tao_any,
-      CORBA::ConstructionPolicy::_tao_any_destructor,
-      CORBA::_tc_ConstructionPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ConstructionPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ConstructionPolicy>::extract (
-        _tao_any,
-        CORBA::ConstructionPolicy::_tao_any_destructor,
-        CORBA::_tc_ConstructionPolicy,
-        _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::DomainManagerList &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::DomainManagerList>::insert_copy (
-      _tao_any,
-      CORBA::DomainManagerList::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_DomainManagerList_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::DomainManagerList *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::DomainManagerList>::insert (
-      _tao_any,
-      CORBA::DomainManagerList::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_DomainManagerList_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::DomainManagerList *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::DomainManagerList *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::DomainManagerList *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::DomainManagerList>::extract (
-        _tao_any,
-        CORBA::DomainManagerList::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_DomainManagerList_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp
index a87836007e5..edc3ef28c7c 100644
--- a/TAO/tao/DomainC.cpp
+++ b/TAO/tao/DomainC.cpp
@@ -31,7 +31,6 @@
 
 #include "DomainC.h"
 #include "tao/CDR.h"
-#include "tao/Exception_Data.h"
 #include "tao/Invocation_Adapter.h"
 #include "tao/Object_T.h"
 #include "tao/Basic_Arguments.h"
@@ -41,6 +40,7 @@
 
 #include "tao/ORB_Core.h"
 #include "tao/IFR_Client_Adapter.h"
+#include "tao/Any_Insert_Policy_T.h"
 #include "ace/Dynamic_Service.h"
 
 #if defined (__BORLANDC__)
@@ -68,24 +68,12 @@ namespace TAO
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-  template<>
-  void
-  In_Object_Argument_T<CORBA::InterfaceDef_ptr>::interceptor_param (Dynamic::Parameter & p)
-  {
-    TAO_IFR_Client_Adapter *adapter =
-      ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
-          TAO_ORB_Core::ifr_client_adapter_name ()
-        );
-
-    adapter->interfacedef_any_insert (p.argument, this->x_);
-    p.mode = CORBA::PARAM_IN;
-  }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
   template<>
   CORBA::Boolean
-  In_Object_Argument_T<CORBA::InterfaceDef_ptr>::marshal (TAO_OutputCDR & cdr)
+  In_Object_Argument_T<CORBA::InterfaceDef_ptr, TAO::Any_Insert_Policy_IFR_Client_Adapter <CORBA::InterfaceDef_ptr> >::marshal (TAO_OutputCDR &cdr)
   {
     TAO_IFR_Client_Adapter *adapter =
       ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
@@ -102,7 +90,7 @@ namespace TAO
 
 #if !defined (_CORBA_POLICY__ARG_TRAITS_CS_)
 #define _CORBA_POLICY__ARG_TRAITS_CS_
-  
+
   template<>
   class  Arg_Traits<CORBA::Policy>
     : public
@@ -110,7 +98,8 @@ namespace TAO
             CORBA::Policy_ptr,
             CORBA::Policy_var,
             CORBA::Policy_out,
-            TAO::Objref_Traits<CORBA::Policy>
+            TAO::Objref_Traits<CORBA::Policy>,
+            TAO::Any_Insert_Policy_AnyTypeCode_Adapter <CORBA::Policy_ptr>
           >
   {
   };
@@ -119,7 +108,7 @@ namespace TAO
 
 #if !defined (_CORBA_INTERFACEDEF__ARG_TRAITS_CS_)
 #define _CORBA_INTERFACEDEF__ARG_TRAITS_CS_
-  
+
   template<>
   class  Arg_Traits<CORBA::InterfaceDef>
     : public
@@ -127,7 +116,8 @@ namespace TAO
             CORBA::InterfaceDef_ptr,
             CORBA::InterfaceDef_var,
             CORBA::InterfaceDef_out,
-            TAO::Objref_Traits<CORBA::InterfaceDef>
+            TAO::Objref_Traits<CORBA::InterfaceDef>,
+            TAO::Any_Insert_Policy_IFR_Client_Adapter <CORBA::InterfaceDef_ptr>
           >
   {
   };
@@ -173,7 +163,7 @@ TAO::Objref_Traits<CORBA::DomainManager>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_DomainManager_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -193,21 +183,21 @@ TAO::Collocation_Proxy_Broker *
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_DomainManager_Proxy_Broker_ == 0)
     {
       CORBA_DomainManager_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::Policy>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::PolicyType>::in_arg_val _tao_policy_type (policy_type);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_policy_type
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -216,10 +206,10 @@ TAO::Collocation_Proxy_Broker *
       17,
       this->the_TAO_DomainManager_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -242,7 +232,7 @@ CORBA::DomainManager::CORBA_DomainManager_setup_collocation ()
 CORBA::DomainManager::~DomainManager (void)
 {}
 
-void 
+void
 CORBA::DomainManager::_tao_any_destructor (void *_tao_void_pointer)
 {
   DomainManager *_tao_tmp_pointer =
@@ -287,7 +277,7 @@ CORBA::DomainManager::_duplicate (DomainManager_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -373,7 +363,7 @@ TAO::Objref_Traits<CORBA::ConstructionPolicy>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -394,23 +384,23 @@ void CORBA::ConstructionPolicy::make_domain_manager (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ConstructionPolicy_Proxy_Broker_ == 0)
     {
       CORBA_ConstructionPolicy_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::InterfaceDef>::in_arg_val _tao_object_type (object_type);
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_constr_policy (constr_policy);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_object_type,
       &_tao_constr_policy
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -419,7 +409,7 @@ void CORBA::ConstructionPolicy::make_domain_manager (
       19,
       this->the_TAO_ConstructionPolicy_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -438,14 +428,14 @@ CORBA::ConstructionPolicy::CORBA_ConstructionPolicy_setup_collocation ()
       this->the_TAO_ConstructionPolicy_Proxy_Broker_ =
         ::CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_Policy_setup_collocation ();
 }
 
 CORBA::ConstructionPolicy::~ConstructionPolicy (void)
 {}
 
-void 
+void
 CORBA::ConstructionPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   ConstructionPolicy *_tao_tmp_pointer =
@@ -490,7 +480,7 @@ CORBA::ConstructionPolicy::_duplicate (ConstructionPolicy_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -543,7 +533,7 @@ CORBA::ConstructionPolicy::marshal (TAO_OutputCDR &cdr)
   return (cdr << this);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_DOMAINMANAGERLIST_CS_)
@@ -617,21 +607,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::CORBA::DomainManager RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA__TAO_DomainManager_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
 
@@ -653,21 +643,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::CORBA::ConstructionPolicy RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
 
@@ -683,12 +673,12 @@ CORBA::Boolean operator<< (
   )
 {
   const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = true;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag =
@@ -696,10 +686,10 @@ CORBA::Boolean operator<< (
                 _tao_sequence[i].in (), strm
               );
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return false;
 }
 
@@ -709,7 +699,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -719,28 +709,28 @@ CORBA::Boolean operator>> (
         {
           return false;
         }
-      
+
       // 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 true;
         }
-      
+
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = true;
-      
+
       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 false;
 }
 
diff --git a/TAO/tao/DomainC.h b/TAO/tao/DomainC.h
index f9ec80e94ca..5a4683f1b2a 100644
--- a/TAO/tao/DomainC.h
+++ b/TAO/tao/DomainC.h
@@ -66,7 +66,7 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_root/root_ch.cpp:62
 
 namespace TAO
@@ -80,22 +80,22 @@ namespace TAO
 
 namespace CORBA
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_DOMAINMANAGER__VAR_OUT_CH_)
 #define _CORBA_DOMAINMANAGER__VAR_OUT_CH_
-  
+
   class DomainManager;
   typedef DomainManager *DomainManager_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         DomainManager
       >
     DomainManager_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         DomainManager
@@ -103,13 +103,13 @@ namespace CORBA
     DomainManager_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_DOMAINMANAGER_CH_)
 #define _CORBA_DOMAINMANAGER_CH_
-  
+
   class TAO_Export DomainManager
     : public virtual CORBA::Object
   {
@@ -117,32 +117,32 @@ namespace CORBA
     friend class TAO::Narrow_Utils<DomainManager>;
     typedef DomainManager_ptr _ptr_type;
     typedef DomainManager_var _var_type;
-    
+
     // The static operations.
     static DomainManager_ptr _duplicate (DomainManager_ptr obj);
-    
+
     static void _tao_release (DomainManager_ptr obj);
-    
+
     static DomainManager_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DomainManager_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DomainManager_ptr _nil (void)
     {
       return static_cast<DomainManager_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::Policy_ptr get_domain_policy (
         ::CORBA::PolicyType policy_type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -150,34 +150,34 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_DomainManager_Proxy_Broker_;
-  
+
   protected:
     // Concrete interface only.
     DomainManager (void);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_DomainManager_setup_collocation (void);
-    
+
     // Concrete non-local interface only.
     DomainManager (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     // Non-local interface only.
     DomainManager (
         TAO_Stub *objref,
@@ -185,43 +185,38 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     virtual ~DomainManager (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     DomainManager (const DomainManager &);
-    
+
     void operator= (const DomainManager &);
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_DomainManager;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const CORBA::PolicyType SecConstruction = 11U;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_CONSTRUCTIONPOLICY__VAR_OUT_CH_)
 #define _CORBA_CONSTRUCTIONPOLICY__VAR_OUT_CH_
-  
+
   class ConstructionPolicy;
   typedef ConstructionPolicy *ConstructionPolicy_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ConstructionPolicy
       >
     ConstructionPolicy_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ConstructionPolicy
@@ -229,13 +224,13 @@ namespace CORBA
     ConstructionPolicy_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_CONSTRUCTIONPOLICY_CH_)
 #define _CORBA_CONSTRUCTIONPOLICY_CH_
-  
+
   class TAO_Export ConstructionPolicy
     : public virtual ::CORBA::Policy
   {
@@ -243,32 +238,32 @@ namespace CORBA
     friend class TAO::Narrow_Utils<ConstructionPolicy>;
     typedef ConstructionPolicy_ptr _ptr_type;
     typedef ConstructionPolicy_var _var_type;
-    
+
     // The static operations.
     static ConstructionPolicy_ptr _duplicate (ConstructionPolicy_ptr obj);
-    
+
     static void _tao_release (ConstructionPolicy_ptr obj);
-    
+
     static ConstructionPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ConstructionPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ConstructionPolicy_ptr _nil (void)
     {
       return static_cast<ConstructionPolicy_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void make_domain_manager (
         ::CORBA::InterfaceDef_ptr object_type,
         ::CORBA::Boolean constr_policy
@@ -277,34 +272,34 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_ConstructionPolicy_Proxy_Broker_;
-  
+
   protected:
     // Concrete interface only.
     ConstructionPolicy (void);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_ConstructionPolicy_setup_collocation (void);
-    
+
     // Concrete non-local interface only.
     ConstructionPolicy (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     // Non-local interface only.
     ConstructionPolicy (
         TAO_Stub *objref,
@@ -312,31 +307,26 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     virtual ~ConstructionPolicy (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     ConstructionPolicy (const ConstructionPolicy &);
-    
+
     void operator= (const ConstructionPolicy &);
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ConstructionPolicy;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_DOMAINMANAGERLIST_CH_)
 #define _CORBA_DOMAINMANAGERLIST_CH_
-  
+
   class DomainManagerList;
-  
+
   typedef
     TAO_MngSeq_Var_T<
         DomainManagerList,
@@ -346,7 +336,7 @@ namespace CORBA
           >
       >
     DomainManagerList_var;
-  
+
   typedef
     TAO_MngSeq_Out_T<
         DomainManagerList,
@@ -357,7 +347,7 @@ namespace CORBA
           >
       >
     DomainManagerList_out;
-  
+
   class TAO_Export DomainManagerList
     : public
         TAO_Unbounded_Object_Sequence<
@@ -371,23 +361,18 @@ namespace CORBA
     DomainManagerList (
         CORBA::ULong max,
         CORBA::ULong length,
-        DomainManager_ptr* buffer, 
+        DomainManager_ptr* buffer,
         CORBA::Boolean release = 0
       );
     DomainManagerList (const DomainManagerList &);
     ~DomainManagerList (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef DomainManagerList_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_DomainManagerList;
 
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:66
@@ -420,7 +405,7 @@ namespace TAO
 
 #if !defined (_CORBA_DOMAINMANAGER__TRAITS_CH_)
 #define _CORBA_DOMAINMANAGER__TRAITS_CH_
-  
+
   template<>
   struct TAO_Export Objref_Traits< ::CORBA::DomainManager>
   {
@@ -441,7 +426,7 @@ namespace TAO
 
 #if !defined (_CORBA_CONSTRUCTIONPOLICY__TRAITS_CH_)
 #define _CORBA_CONSTRUCTIONPOLICY__TRAITS_CH_
-  
+
   template<>
   struct TAO_Export Objref_Traits< ::CORBA::ConstructionPolicy>
   {
@@ -462,28 +447,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// 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 &);
-
-// TAO_IDL - Generated from
-// 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
-// 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
 // be\be_visitor_interface/cdr_op_ch.cpp:55
 
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::DomainManager_ptr );
diff --git a/TAO/tao/DoubleSeqA.cpp b/TAO/tao/DoubleSeqA.cpp
deleted file mode 100644
index a8a2fa37ff6..00000000000
--- a/TAO/tao/DoubleSeqA.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-// -*- 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/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "DoubleSeqC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_CORBA_DoubleSeq_GUARD
-#define _TAO_TYPECODE_CORBA_DoubleSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_DoubleSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_double,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_DoubleSeq_0 =
-      &CORBA_DoubleSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_DoubleSeq_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_DoubleSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/DoubleSeq:1.0",
-    "DoubleSeq",
-    &TAO::TypeCode::tc_CORBA_DoubleSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_DoubleSeq =
-    &_tao_tc_CORBA_DoubleSeq;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::DoubleSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::DoubleSeq>::insert_copy (
-      _tao_any,
-      CORBA::DoubleSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_DoubleSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::DoubleSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::DoubleSeq>::insert (
-      _tao_any,
-      CORBA::DoubleSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_DoubleSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::DoubleSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::DoubleSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::DoubleSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::DoubleSeq>::extract (
-        _tao_any,
-        CORBA::DoubleSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_DoubleSeq_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/DoubleSeqC.h b/TAO/tao/DoubleSeqC.h
index f80935d8347..a4fca3750b7 100644
--- a/TAO/tao/DoubleSeqC.h
+++ b/TAO/tao/DoubleSeqC.h
@@ -66,22 +66,22 @@
 
 namespace CORBA
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_DOUBLESEQ_CH_)
 #define _CORBA_DOUBLESEQ_CH_
-  
+
   class DoubleSeq;
-  
+
   typedef
     TAO_FixedSeq_Var_T<
         DoubleSeq,
         CORBA::Double
       >
     DoubleSeq_var;
-  
+
   typedef
     TAO_Seq_Out_T<
         DoubleSeq,
@@ -89,7 +89,7 @@ namespace CORBA
         CORBA::Double
       >
     DoubleSeq_out;
-  
+
   class TAO_Export DoubleSeq
     : public
         TAO_Unbounded_Sequence<
@@ -102,23 +102,18 @@ namespace CORBA
     DoubleSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        CORBA::Double* buffer, 
+        CORBA::Double* buffer,
         CORBA::Boolean release = 0
       );
     DoubleSeq (const DoubleSeq &);
     ~DoubleSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef DoubleSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_DoubleSeq;
 
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:66
@@ -134,14 +129,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::DoubleSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::DoubleSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::DoubleSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::DoubleSeq *&);
-
-// TAO_IDL - Generated from
 // be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_CORBA_DoubleSeq_H_
diff --git a/TAO/tao/Dynamic.pidl b/TAO/tao/Dynamic.pidl
deleted file mode 100644
index 2ef06f278df..00000000000
--- a/TAO/tao/Dynamic.pidl
+++ /dev/null
@@ -1,46 +0,0 @@
-// -*- IDL -*-
-
-// ================================================================
-/**
- *  @file   Dynamic.pidl
- *
- * $Id$
- *
- *   This file was used to generate the code in DynamicC.* The command
- *   used to generate code is:
- *
- *     tao_idl
- *        -o orig -Ge 1 -GA -Sc -SS -Sci
- *          -Wb,export_macro=TAO_Export
- *          -Wb,export_include="tao/TAO_Export.h"
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          Dynamic.pidl
- *
- */
-// ================================================================
-
-// File: Dynamic.idl
-// Used primarily for Interceptors
-
-#include "Dynamic_Parameter.pidl"
-#include "StringSeq.pidl"
-#include "Typecode_types.pidl"
-
-#ifndef _DYNAMIC_IDL_
-#define _DYNAMIC_IDL_
-
-module Dynamic
-{
-  typeprefix Dynamic "omg.org";
-
-  typedef sequence<Parameter> ParameterList;
-
-  typedef CORBA::StringSeq ContextList;
-
-  typedef sequence<CORBA::TypeCode> ExceptionList;
-
-  typedef CORBA::StringSeq RequestContext;
-};
-
-#endif // _DYNAMIC_IDL_
diff --git a/TAO/tao/DynamicA.cpp b/TAO/tao/DynamicA.cpp
deleted file mode 100644
index f1cbfa9bc5b..00000000000
--- a/TAO/tao/DynamicA.cpp
+++ /dev/null
@@ -1,290 +0,0 @@
-// -*- 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/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "DynamicC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_Dynamic_ParameterList_GUARD
-#define _TAO_TYPECODE_Dynamic_ParameterList_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      Dynamic_ParameterList_0 (
-        CORBA::tk_sequence,
-        &Dynamic::_tc_Parameter,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_Dynamic_ParameterList_0 =
-      &Dynamic_ParameterList_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_Dynamic_ParameterList_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_Dynamic_ParameterList (
-    CORBA::tk_alias,
-    "IDL:omg.org/Dynamic/ParameterList:1.0",
-    "ParameterList",
-    &TAO::TypeCode::tc_Dynamic_ParameterList_0);
-  
-namespace Dynamic
-{
-  ::CORBA::TypeCode_ptr const _tc_ParameterList =
-    &_tao_tc_Dynamic_ParameterList;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_Dynamic_ContextList (
-    CORBA::tk_alias,
-    "IDL:omg.org/Dynamic/ContextList:1.0",
-    "ContextList",
-    &CORBA::_tc_StringSeq);
-  
-namespace Dynamic
-{
-  ::CORBA::TypeCode_ptr const _tc_ContextList =
-    &_tao_tc_Dynamic_ContextList;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_Dynamic_ExceptionList_GUARD
-#define _TAO_TYPECODE_Dynamic_ExceptionList_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      Dynamic_ExceptionList_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_TypeCode,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_Dynamic_ExceptionList_0 =
-      &Dynamic_ExceptionList_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_Dynamic_ExceptionList_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_Dynamic_ExceptionList (
-    CORBA::tk_alias,
-    "IDL:omg.org/Dynamic/ExceptionList:1.0",
-    "ExceptionList",
-    &TAO::TypeCode::tc_Dynamic_ExceptionList_0);
-  
-namespace Dynamic
-{
-  ::CORBA::TypeCode_ptr const _tc_ExceptionList =
-    &_tao_tc_Dynamic_ExceptionList;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_Dynamic_RequestContext (
-    CORBA::tk_alias,
-    "IDL:omg.org/Dynamic/RequestContext:1.0",
-    "RequestContext",
-    &CORBA::_tc_StringSeq);
-  
-namespace Dynamic
-{
-  ::CORBA::TypeCode_ptr const _tc_RequestContext =
-    &_tao_tc_Dynamic_RequestContext;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const Dynamic::ParameterList &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<Dynamic::ParameterList>::insert_copy (
-      _tao_any,
-      Dynamic::ParameterList::_tao_any_destructor,
-      TAO::TypeCode::tc_Dynamic_ParameterList_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    Dynamic::ParameterList *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<Dynamic::ParameterList>::insert (
-      _tao_any,
-      Dynamic::ParameterList::_tao_any_destructor,
-      TAO::TypeCode::tc_Dynamic_ParameterList_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    Dynamic::ParameterList *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const Dynamic::ParameterList *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const Dynamic::ParameterList *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<Dynamic::ParameterList>::extract (
-        _tao_any,
-        Dynamic::ParameterList::_tao_any_destructor,
-        TAO::TypeCode::tc_Dynamic_ParameterList_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const Dynamic::ExceptionList &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<Dynamic::ExceptionList>::insert_copy (
-      _tao_any,
-      Dynamic::ExceptionList::_tao_any_destructor,
-      TAO::TypeCode::tc_Dynamic_ExceptionList_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    Dynamic::ExceptionList *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<Dynamic::ExceptionList>::insert (
-      _tao_any,
-      Dynamic::ExceptionList::_tao_any_destructor,
-      TAO::TypeCode::tc_Dynamic_ExceptionList_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    Dynamic::ExceptionList *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const Dynamic::ExceptionList *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const Dynamic::ExceptionList *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<Dynamic::ExceptionList>::extract (
-        _tao_any,
-        Dynamic::ExceptionList::_tao_any_destructor,
-        TAO::TypeCode::tc_Dynamic_ExceptionList_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/DynamicAny.mpc b/TAO/tao/DynamicAny.mpc
index a064db9ca07..fae92577a06 100644
--- a/TAO/tao/DynamicAny.mpc
+++ b/TAO/tao/DynamicAny.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project : taolib, core {
+project : taolib, core, anytypecode {
   sharedname    = TAO_DynamicAny
   dynamicflags  = TAO_DYNAMICANY_BUILD_DLL
 
@@ -27,6 +27,9 @@ project : taolib, core {
     DynamicAny
   }
 
+  IDL_Files {
+  }
+
   Pkgconfig_Files {
     DynamicAny/TAO_DynamicAny.pc.in
   }
diff --git a/TAO/tao/DynamicAny/DynAny_i.cpp b/TAO/tao/DynamicAny/DynAny_i.cpp
index b8562e2af63..76c6b18c3b5 100644
--- a/TAO/tao/DynamicAny/DynAny_i.cpp
+++ b/TAO/tao/DynamicAny/DynAny_i.cpp
@@ -3,7 +3,7 @@
 
 #include "DynAny_i.h"
 #include "DynAnyFactory.h"
-#include "tao/Any_Unknown_IDL_Type.h"
+#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_wchar.h"
 #include "ace/OS_NS_string.h"
diff --git a/TAO/tao/DynamicAny/DynArray_i.cpp b/TAO/tao/DynamicAny/DynArray_i.cpp
index 371fb0467b4..e7dc61d55c5 100644
--- a/TAO/tao/DynamicAny/DynArray_i.cpp
+++ b/TAO/tao/DynamicAny/DynArray_i.cpp
@@ -3,8 +3,8 @@
 
 #include "DynArray_i.h"
 #include "DynAnyFactory.h"
-#include "tao/Marshal.h"
-#include "tao/Any_Unknown_IDL_Type.h"
+#include "tao/AnyTypeCode/Marshal.h"
+#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/CDR.h"
 
 ACE_RCSID (DynamicAny,
@@ -65,7 +65,7 @@ TAO_DynArray_i::init (const CORBA::Any & any
     {
       TAO::Unknown_IDL_Type *unk =
         dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-        
+
       cdr = unk->_tao_get_cdr ();
     }
   else
@@ -268,7 +268,7 @@ TAO_DynArray_i::set_elements (const DynamicAny::AnySeq & value
     }
 
   CORBA::TypeCode_var value_tc;
-  CORBA::TypeCode_var element_type = 
+  CORBA::TypeCode_var element_type =
     this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
@@ -276,7 +276,7 @@ TAO_DynArray_i::set_elements (const DynamicAny::AnySeq & value
     {
       // Check each arg element for type match.
       value_tc = value[i].type ();
-      CORBA::Boolean equivalent = 
+      CORBA::Boolean equivalent =
         value_tc->equivalent (element_type.in ()
                               ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
@@ -359,7 +359,7 @@ TAO_DynArray_i::set_elements_as_dyn_any (
       ACE_THROW (DynamicAny::DynAny::InvalidValue ());
     }
 
-  CORBA::TypeCode_var element_type = 
+  CORBA::TypeCode_var element_type =
     this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
@@ -378,7 +378,7 @@ TAO_DynArray_i::set_elements_as_dyn_any (
 
       if (equivalent)
         {
-          this->da_members_[i] = 
+          this->da_members_[i] =
             values[i]->copy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
         }
@@ -406,7 +406,7 @@ TAO_DynArray_i::from_any (const CORBA::Any& any
     }
 
   CORBA::TypeCode_var tc = any.type ();
-  CORBA::Boolean equivalent = 
+  CORBA::Boolean equivalent =
     this->type_.in ()->equivalent (tc.in ()
                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -422,7 +422,7 @@ TAO_DynArray_i::from_any (const CORBA::Any& any
         {
           TAO::Unknown_IDL_Type *unk =
             dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-            
+
           cdr = unk->_tao_get_cdr ();
         }
       else
@@ -442,7 +442,7 @@ TAO_DynArray_i::from_any (const CORBA::Any& any
           ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
         }
 
-      CORBA::TypeCode_var field_tc = 
+      CORBA::TypeCode_var field_tc =
         this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
@@ -491,7 +491,7 @@ TAO_DynArray_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
                         0);
     }
 
-  CORBA::TypeCode_var field_tc = 
+  CORBA::TypeCode_var field_tc =
     this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
@@ -502,7 +502,7 @@ TAO_DynArray_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
   for (size_t i = 0; i < length; ++i)
     {
       // Recursive step.
-      field_any = 
+      field_any =
         this->da_members_[i]->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
@@ -514,7 +514,7 @@ TAO_DynArray_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
         {
           TAO::Unknown_IDL_Type *field_unk =
             dynamic_cast<TAO::Unknown_IDL_Type *> (field_impl);
-            
+
           field_cdr = field_unk->_tao_get_cdr ();
         }
       else
diff --git a/TAO/tao/DynamicAny/DynCommon.cpp b/TAO/tao/DynamicAny/DynCommon.cpp
index 039093b5baa..9c8b7a6be49 100644
--- a/TAO/tao/DynamicAny/DynCommon.cpp
+++ b/TAO/tao/DynamicAny/DynCommon.cpp
@@ -9,7 +9,7 @@
 #include "DynSequence_i.h"
 #include "DynStruct_i.h"
 #include "DynUnion_i.h"
-#include "tao/Any_Unknown_IDL_Type.h"
+#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_wchar.h"
 #include "ace/OS_NS_string.h"
diff --git a/TAO/tao/DynamicAny/DynEnum_i.cpp b/TAO/tao/DynamicAny/DynEnum_i.cpp
index 8e2b7314d18..7db76b721af 100644
--- a/TAO/tao/DynamicAny/DynEnum_i.cpp
+++ b/TAO/tao/DynamicAny/DynEnum_i.cpp
@@ -2,7 +2,7 @@
 
 #include "DynEnum_i.h"
 #include "DynAnyFactory.h"
-#include "tao/Any_Unknown_IDL_Type.h"
+#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/CDR.h"
 
 #include "ace/OS_NS_string.h"
@@ -56,7 +56,7 @@ TAO_DynEnum_i::init (const CORBA::Any &any
     {
       TAO::Unknown_IDL_Type *unk =
         dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-        
+
       // We don't want unk's rd_ptr to move, in case we are shared by
       // another Any, so we use this to copy the state, not the buffer.
       TAO_InputCDR for_reading (unk->_tao_get_cdr ());
@@ -217,7 +217,7 @@ TAO_DynEnum_i::from_any (const CORBA::Any& any
         {
           TAO::Unknown_IDL_Type *unk =
             dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-            
+
           // We don't want unk's rd_ptr to move, in case we are shared by
           // another Any, so we use this to copy the state, not the buffer.
           TAO_InputCDR for_reading (unk->_tao_get_cdr ());
@@ -294,7 +294,7 @@ TAO_DynEnum_i::equal (DynamicAny::DynAny_ptr rhs
     {
       TAO::Unknown_IDL_Type *unk =
         dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-        
+
       // We don't want unk's rd_ptr to move, in case we are shared by
       // another Any, so we use this to copy the state, not the buffer.
       TAO_InputCDR for_reading (unk->_tao_get_cdr ());
diff --git a/TAO/tao/DynamicAny/DynSequence_i.cpp b/TAO/tao/DynamicAny/DynSequence_i.cpp
index f3307fc080a..2e9d1b7c352 100644
--- a/TAO/tao/DynamicAny/DynSequence_i.cpp
+++ b/TAO/tao/DynamicAny/DynSequence_i.cpp
@@ -3,8 +3,8 @@
 
 #include "DynSequence_i.h"
 #include "DynAnyFactory.h"
-#include "tao/Marshal.h"
-#include "tao/Any_Unknown_IDL_Type.h"
+#include "tao/AnyTypeCode/Marshal.h"
+#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/CDR.h"
 
 ACE_RCSID (DynamicAny,
@@ -59,7 +59,7 @@ TAO_DynSequence_i::init (const CORBA::Any& any
     {
       TAO::Unknown_IDL_Type *unk =
         dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-        
+
       cdr = unk->_tao_get_cdr ();
     }
   else
@@ -480,7 +480,7 @@ TAO_DynSequence_i::set_elements_as_dyn_any (
       this->da_members_.size (length);
     }
 
-  CORBA::TypeCode_var element_type = 
+  CORBA::TypeCode_var element_type =
     this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
@@ -506,7 +506,7 @@ TAO_DynSequence_i::set_elements_as_dyn_any (
               ACE_CHECK;
             }
 
-          this->da_members_[i] = 
+          this->da_members_[i] =
             values[i]->copy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
         }
@@ -550,7 +550,7 @@ TAO_DynSequence_i::from_any (const CORBA::Any & any
     }
 
   CORBA::TypeCode_var tc = any.type ();
-  CORBA::Boolean equivalent = 
+  CORBA::Boolean equivalent =
     this->type_.in ()->equivalent (tc.in ()
                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -566,7 +566,7 @@ TAO_DynSequence_i::from_any (const CORBA::Any & any
         {
           TAO::Unknown_IDL_Type *unk =
             dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-            
+
           cdr = unk->_tao_get_cdr ();
         }
       else
@@ -679,7 +679,7 @@ TAO_DynSequence_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
         {
           TAO::Unknown_IDL_Type *field_unk =
             dynamic_cast<TAO::Unknown_IDL_Type *> (field_impl);
-            
+
           field_cdr = field_unk->_tao_get_cdr ();
         }
       else
diff --git a/TAO/tao/DynamicAny/DynStruct_i.cpp b/TAO/tao/DynamicAny/DynStruct_i.cpp
index 4519b46fbb8..96bff70c7ef 100644
--- a/TAO/tao/DynamicAny/DynStruct_i.cpp
+++ b/TAO/tao/DynamicAny/DynStruct_i.cpp
@@ -3,8 +3,8 @@
 
 #include "DynStruct_i.h"
 #include "DynAnyFactory.h"
-#include "tao/Marshal.h"
-#include "tao/Any_Unknown_IDL_Type.h"
+#include "tao/AnyTypeCode/Marshal.h"
+#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/CDR.h"
 
 ACE_RCSID (DynamicAny,
diff --git a/TAO/tao/DynamicAny/DynUnion_i.cpp b/TAO/tao/DynamicAny/DynUnion_i.cpp
index 1e762006c60..59d6bfe352a 100644
--- a/TAO/tao/DynamicAny/DynUnion_i.cpp
+++ b/TAO/tao/DynamicAny/DynUnion_i.cpp
@@ -3,8 +3,8 @@
 
 #include "DynUnion_i.h"
 #include "DynAnyFactory.h"
-#include "tao/Marshal.h"
-#include "tao/Any_Unknown_IDL_Type.h"
+#include "tao/AnyTypeCode/Marshal.h"
+#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/CDR.h"
 
 ACE_RCSID (DynamicAny,
@@ -154,7 +154,7 @@ TAO_DynUnion_i::set_from_any (const CORBA::Any & any,
     {
       TAO::Unknown_IDL_Type *tmp =
         dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-    
+
       in = tmp->_tao_get_cdr ();
     }
   else
@@ -163,7 +163,7 @@ TAO_DynUnion_i::set_from_any (const CORBA::Any & any,
       TAO_InputCDR tmp_in (out);
       in = tmp_in;
     }
-    
+
   TAO_InputCDR unk_in (in);
   ACE_NEW (unk,
            TAO::Unknown_IDL_Type (disc_tc.in (),
@@ -229,7 +229,7 @@ TAO_DynUnion_i::set_from_any (const CORBA::Any & any,
 
   if (match)
     {
-      CORBA::TypeCode_var member_tc = 
+      CORBA::TypeCode_var member_tc =
         tc->member_type (i
                          ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
@@ -259,7 +259,7 @@ TAO_DynUnion_i::set_from_any (const CORBA::Any & any,
                                         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      CORBA::Long default_index = 
+      CORBA::Long default_index =
         unaliased_tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
@@ -271,7 +271,7 @@ TAO_DynUnion_i::set_from_any (const CORBA::Any & any,
         {
           CORBA::ULong index = static_cast<CORBA::ULong> (default_index);
 
-          CORBA::TypeCode_var default_tc = 
+          CORBA::TypeCode_var default_tc =
             tc->member_type (index
                              ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
@@ -332,7 +332,7 @@ TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value
   CORBA::TypeCode_var tc = value->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::TypeCode_var disc_tc = 
+  CORBA::TypeCode_var disc_tc =
     this->discriminator_->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
@@ -348,7 +348,7 @@ TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value
   CORBA::Any_var value_any = value->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::ULong length = 
+  CORBA::ULong length =
     this->type_->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
@@ -404,7 +404,7 @@ TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value
       ACE_CHECK;
 
       // Initialize member to default value.
-      this->member_ = 
+      this->member_ =
         TAO_DynAnyFactory::make_dyn_any (member_tc.in ()
                                          ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
@@ -424,7 +424,7 @@ TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value
       ACE_CHECK;
 
       // If no match, either the default member or no member is active.
-      CORBA::Long default_index = 
+      CORBA::Long default_index =
         unaliased_tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
@@ -471,7 +471,7 @@ TAO_DynUnion_i::set_to_default_member (ACE_ENV_SINGLE_ARG_DECL)
                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::Long default_index = 
+  CORBA::Long default_index =
     unaliased_tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
@@ -492,7 +492,7 @@ TAO_DynUnion_i::set_to_default_member (ACE_ENV_SINGLE_ARG_DECL)
       this->member_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
-      this->member_ = 
+      this->member_ =
         TAO_DynAnyFactory::make_dyn_any (default_tc.in ()
                                          ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
@@ -523,7 +523,7 @@ TAO_DynUnion_i::set_to_no_active_member (ACE_ENV_SINGLE_ARG_DECL)
                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::Long default_index = 
+  CORBA::Long default_index =
     unaliased_tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
@@ -535,22 +535,22 @@ TAO_DynUnion_i::set_to_no_active_member (ACE_ENV_SINGLE_ARG_DECL)
     }
   else
     {
-      CORBA::TypeCode_var disc_tc = 
+      CORBA::TypeCode_var disc_tc =
         this->discriminator_->type (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
-      CORBA::TCKind kind = 
+      CORBA::TCKind kind =
         TAO_DynAnyFactory::unalias (disc_tc.in ()
                                     ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (kind == CORBA::tk_enum)
         {
-          CORBA::ULong member_count = 
+          CORBA::ULong member_count =
             this->type_->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
-          CORBA::ULong label_count = 
+          CORBA::ULong label_count =
             disc_tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
@@ -595,7 +595,7 @@ TAO_DynUnion_i::discriminator_kind (ACE_ENV_SINGLE_ARG_DECL)
                         CORBA::tk_null);
     }
 
-  CORBA::TypeCode_var tc = 
+  CORBA::TypeCode_var tc =
     this->discriminator_->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::tk_null);
 
@@ -692,7 +692,7 @@ TAO_DynUnion_i::member_kind (ACE_ENV_SINGLE_ARG_DECL)
                         CORBA::tk_null);
     }
 
-  CORBA::TypeCode_var tc = 
+  CORBA::TypeCode_var tc =
     this->member_->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::tk_null);
 
@@ -720,7 +720,7 @@ TAO_DynUnion_i::from_any (const CORBA::Any& any
     }
 
   CORBA::TypeCode_var tc = any.type ();
-  CORBA::Boolean equivalent = 
+  CORBA::Boolean equivalent =
     this->type_.in ()->equivalent (tc.in ()
                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -762,11 +762,11 @@ TAO_DynUnion_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
 
   // Add the discriminator to the CDR stream.
 
-  CORBA::TypeCode_var disc_tc = 
+  CORBA::TypeCode_var disc_tc =
     this->discriminator_->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  CORBA::Any_var disc_any = 
+  CORBA::Any_var disc_any =
     this->discriminator_->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
@@ -778,7 +778,7 @@ TAO_DynUnion_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::Unknown_IDL_Type *disc_unk =
         dynamic_cast<TAO::Unknown_IDL_Type *> (disc_any_impl);
-        
+
       disc_in_cdr = disc_unk->_tao_get_cdr ();
     }
   else
@@ -797,14 +797,14 @@ TAO_DynUnion_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
   // Add the member to the CDR stream unless it has no active member.
   if (this->has_no_active_member () == 0)
     {
-      CORBA::TypeCode_var member_tc = 
+      CORBA::TypeCode_var member_tc =
         this->member_->type (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
-     
-      CORBA::Any_var member_any = 
+
+      CORBA::Any_var member_any =
         this->member_->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
-     
+
       TAO::Any_Impl *member_any_impl = member_any->impl ();
       TAO_OutputCDR member_out_cdr;
       TAO_InputCDR member_in_cdr (static_cast<ACE_Message_Block *> (0));
@@ -813,7 +813,7 @@ TAO_DynUnion_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
         {
           TAO::Unknown_IDL_Type *member_unk =
             dynamic_cast<TAO::Unknown_IDL_Type *> (member_any_impl);
-            
+
           member_in_cdr = member_unk->_tao_get_cdr ();
         }
       else
@@ -822,14 +822,14 @@ TAO_DynUnion_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
           TAO_InputCDR member_tmp_in_cdr (member_out_cdr);
           member_in_cdr = member_tmp_in_cdr;
         }
-     
+
       (void) TAO_Marshal_Object::perform_append (member_tc.in (),
                                                 &member_in_cdr,
                                                 &out_cdr
                                                 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
-  
+
   // Make the Any.
   TAO_InputCDR in_cdr (out_cdr);
 
@@ -872,7 +872,7 @@ TAO_DynUnion_i::equal (DynamicAny::DynAny_ptr rhs
       return 0;
     }
 
-  CORBA::Boolean equivalent = 
+  CORBA::Boolean equivalent =
     this->type_->equivalent (impl->type_.in ()
                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
@@ -882,7 +882,7 @@ TAO_DynUnion_i::equal (DynamicAny::DynAny_ptr rhs
       return 0;
     }
 
-  CORBA::Boolean member_equal = 
+  CORBA::Boolean member_equal =
     this->member_->equal (impl->member_.in ()
                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
@@ -1070,14 +1070,14 @@ TAO_DynUnion_i::label_match (const CORBA::Any &my_any,
       {
         CORBA::ULong my_val;
         CORBA::ULong other_val;
-        
+
         TAO::Any_Impl *my_impl = my_any.impl ();
 
         if (my_impl->encoded ())
           {
             TAO::Unknown_IDL_Type *my_unk =
               dynamic_cast<TAO::Unknown_IDL_Type *> (my_impl);
-              
+
             // We don't want unk's rd_ptr to move, in case we are shared by
             // another Any, so we use this to copy the state, not the buffer.
             TAO_InputCDR for_reading (my_unk->_tao_get_cdr ());
@@ -1092,12 +1092,12 @@ TAO_DynUnion_i::label_match (const CORBA::Any &my_any,
           }
 
         TAO::Any_Impl *other_impl = other_any.impl ();
-        
+
         if (other_impl->encoded ())
           {
             TAO::Unknown_IDL_Type *other_unk =
               dynamic_cast<TAO::Unknown_IDL_Type *> (other_impl);
-              
+
             // We don't want unk's rd_ptr to move, in case we are shared by
             // another Any, so we use this to copy the state, not the buffer.
             TAO_InputCDR for_reading (other_unk->_tao_get_cdr ());
@@ -1110,7 +1110,7 @@ TAO_DynUnion_i::label_match (const CORBA::Any &my_any,
             TAO_InputCDR other_in (other_out);
             other_in.read_ulong (other_val);
           }
-          
+
         return my_val == other_val;
       }
     // Cannot happen - we've covered all the legal discriminator types.
diff --git a/TAO/tao/DynamicAny/DynamicAnyC.h b/TAO/tao/DynamicAny/DynamicAnyC.h
index 38d2c82257e..9d8b9c916d8 100644
--- a/TAO/tao/DynamicAny/DynamicAnyC.h
+++ b/TAO/tao/DynamicAny/DynamicAnyC.h
@@ -49,9 +49,9 @@
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
-#include "tao/TypeCode.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Any.h"
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Any.h"
 #include "tao/Sequence_T.h"
 #include "tao/Objref_VarOut_T.h"
 #include "tao/Seq_Var_T.h"
@@ -79,22 +79,22 @@
 
 namespace DynamicAny
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_DYNAMICANY_DYNANY__VAR_OUT_CH_)
 #define _DYNAMICANY_DYNANY__VAR_OUT_CH_
-  
+
   class DynAny;
   typedef DynAny *DynAny_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         DynAny
       >
     DynAny_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         DynAny
@@ -102,63 +102,63 @@ namespace DynamicAny
     DynAny_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_DYNAMICANY_DYNANY_CH_)
 #define _DYNAMICANY_DYNANY_CH_
-  
+
   class TAO_DynamicAny_Export DynAny
     : public virtual CORBA::Object
   {
   public:
     typedef DynAny_ptr _ptr_type;
     typedef DynAny_var _var_type;
-    
+
     // The static operations.
     static DynAny_ptr _duplicate (DynAny_ptr obj);
-    
+
     static void _tao_release (DynAny_ptr obj);
-    
+
     static DynAny_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DynAny_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DynAny_ptr _nil (void)
     {
       return static_cast<DynAny_ptr> (0);
     }
-    
-    
-    
+
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_DYNAMICANY_DYNANY_INVALIDVALUE_CH_)
 #define _DYNAMICANY_DYNANY_INVALIDVALUE_CH_
-    
+
     class TAO_DynamicAny_Export InvalidValue : public CORBA::UserException
     {
     public:
-      
+
       InvalidValue (void);
       InvalidValue (const InvalidValue &);
       ~InvalidValue (void);
 
       InvalidValue &operator= (const InvalidValue &);
-      
+
       static InvalidValue *_downcast (CORBA::Exception *);
       static const InvalidValue *_downcast (CORBA::Exception const *);
-      
+
       static CORBA::Exception *_alloc (void);
-      
+
       virtual CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
@@ -167,39 +167,39 @@ namespace DynamicAny
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:127
     };
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_DYNAMICANY_DYNANY_TYPEMISMATCH_CH_)
 #define _DYNAMICANY_DYNANY_TYPEMISMATCH_CH_
-    
+
     class TAO_DynamicAny_Export TypeMismatch : public CORBA::UserException
     {
     public:
-      
+
       TypeMismatch (void);
       TypeMismatch (const TypeMismatch &);
       ~TypeMismatch (void);
 
       TypeMismatch &operator= (const TypeMismatch &);
-      
+
       static TypeMismatch *_downcast (CORBA::Exception *);
       static const TypeMismatch *_downcast (CORBA::Exception const *);
-      
+
       static CORBA::Exception *_alloc (void);
-      
+
       virtual CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
@@ -208,31 +208,31 @@ namespace DynamicAny
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:127
     };
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // 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
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void assign (
         ::DynamicAny::DynAny_ptr dyn_any
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -241,10 +241,10 @@ namespace DynamicAny
         CORBA::SystemException,
         ::DynamicAny::DynAny::TypeMismatch
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void from_any (
         const ::CORBA::Any & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -254,20 +254,20 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // 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
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Boolean equal (
         ::DynamicAny::DynAny_ptr dyn_any
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -275,30 +275,30 @@ namespace DynamicAny
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // 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
     // 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
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_boolean (
         ::CORBA::Boolean value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -308,10 +308,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_octet (
         ::CORBA::Octet value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -321,10 +321,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_char (
         ::CORBA::Char value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -334,10 +334,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_short (
         ::CORBA::Short value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -347,10 +347,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_ushort (
         ::CORBA::UShort value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -360,10 +360,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_long (
         ::CORBA::Long value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -373,10 +373,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_ulong (
         ::CORBA::ULong value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -386,10 +386,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_float (
         ::CORBA::Float value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -399,10 +399,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_double (
         ::CORBA::Double value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -412,10 +412,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_string (
         const char * value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -425,10 +425,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_reference (
         ::CORBA::Object_ptr value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -438,10 +438,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_typecode (
         ::CORBA::TypeCode_ptr value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -451,10 +451,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_longlong (
         ::CORBA::LongLong value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -464,10 +464,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_ulonglong (
         ::CORBA::ULongLong value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -477,10 +477,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_longdouble (
         ::CORBA::LongDouble value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -490,10 +490,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_wchar (
         ::CORBA::WChar value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -503,10 +503,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_wstring (
         const CORBA::WChar * value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -516,10 +516,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_any (
         const ::CORBA::Any & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -529,10 +529,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_dyn_any (
         ::DynamicAny::DynAny_ptr value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -542,10 +542,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_val (
         ::CORBA::ValueBase * value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -555,10 +555,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Boolean get_boolean (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -567,10 +567,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Octet get_octet (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -579,10 +579,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Char get_char (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -591,10 +591,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Short get_short (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -603,10 +603,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::UShort get_ushort (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -615,10 +615,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Long get_long (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -627,10 +627,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::ULong get_ulong (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -639,10 +639,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Float get_float (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -651,10 +651,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Double get_double (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -663,10 +663,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual char * get_string (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -675,10 +675,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Object_ptr get_reference (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -687,10 +687,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr get_typecode (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -699,10 +699,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::LongLong get_longlong (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -711,10 +711,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::ULongLong get_ulonglong (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -723,10 +723,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::LongDouble get_longdouble (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -735,10 +735,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::WChar get_wchar (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -747,10 +747,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::WChar * get_wstring (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -759,10 +759,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Any * get_any (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -771,10 +771,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::DynamicAny::DynAny_ptr get_dyn_any (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -783,10 +783,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::ValueBase * get_val (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -795,10 +795,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Boolean seek (
         ::CORBA::Long index
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -806,40 +806,40 @@ namespace DynamicAny
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // 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
     // 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
     // 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
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::DynamicAny::DynAny_ptr current_component (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -847,48 +847,48 @@ namespace DynamicAny
         CORBA::SystemException,
         ::DynamicAny::DynAny::TypeMismatch
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     DynAny (void);
-    
+
     virtual ~DynAny (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     DynAny (const DynAny &);
-    
+
     void operator= (const DynAny &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_DYNAMICANY_DYNFIXED__VAR_OUT_CH_)
 #define _DYNAMICANY_DYNFIXED__VAR_OUT_CH_
-  
+
   class DynFixed;
   typedef DynFixed *DynFixed_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         DynFixed
       >
     DynFixed_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         DynFixed
@@ -896,55 +896,55 @@ namespace DynamicAny
     DynFixed_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_DYNAMICANY_DYNFIXED_CH_)
 #define _DYNAMICANY_DYNFIXED_CH_
-  
+
   class TAO_DynamicAny_Export DynFixed
     : public virtual ::DynamicAny::DynAny
   {
   public:
     typedef DynFixed_ptr _ptr_type;
     typedef DynFixed_var _var_type;
-    
+
     // The static operations.
     static DynFixed_ptr _duplicate (DynFixed_ptr obj);
-    
+
     static void _tao_release (DynFixed_ptr obj);
-    
+
     static DynFixed_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DynFixed_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DynFixed_ptr _nil (void)
     {
       return static_cast<DynFixed_ptr> (0);
     }
-    
-    
-    
+
+
+
     // TAO_IDL - Generated from
     // 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
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Boolean set_value (
         const char * val
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -954,48 +954,48 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     DynFixed (void);
-    
+
     virtual ~DynFixed (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     DynFixed (const DynFixed &);
-    
+
     void operator= (const DynFixed &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_DYNAMICANY_DYNENUM__VAR_OUT_CH_)
 #define _DYNAMICANY_DYNENUM__VAR_OUT_CH_
-  
+
   class DynEnum;
   typedef DynEnum *DynEnum_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         DynEnum
       >
     DynEnum_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         DynEnum
@@ -1003,55 +1003,55 @@ namespace DynamicAny
     DynEnum_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_DYNAMICANY_DYNENUM_CH_)
 #define _DYNAMICANY_DYNENUM_CH_
-  
+
   class TAO_DynamicAny_Export DynEnum
     : public virtual ::DynamicAny::DynAny
   {
   public:
     typedef DynEnum_ptr _ptr_type;
     typedef DynEnum_var _var_type;
-    
+
     // The static operations.
     static DynEnum_ptr _duplicate (DynEnum_ptr obj);
-    
+
     static void _tao_release (DynEnum_ptr obj);
-    
+
     static DynEnum_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DynEnum_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DynEnum_ptr _nil (void)
     {
       return static_cast<DynEnum_ptr> (0);
     }
-    
-    
-    
+
+
+
     // TAO_IDL - Generated from
     // 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
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void set_as_string (
         const char * value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1060,20 +1060,20 @@ namespace DynamicAny
         CORBA::SystemException,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // 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
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void set_as_ulong (
         ::CORBA::ULong value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1082,85 +1082,85 @@ namespace DynamicAny
         CORBA::SystemException,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     DynEnum (void);
-    
+
     virtual ~DynEnum (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     DynEnum (const DynEnum &);
-    
+
     void operator= (const DynEnum &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:413
-  
+
   typedef char * FieldName;
   typedef CORBA::String_var FieldName_var;
   typedef CORBA::String_out FieldName_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct NameValuePair;
-  
+
   typedef
     TAO_Var_Var_T<
         NameValuePair
       >
     NameValuePair_var;
-  
+
   typedef
     TAO_Out_T<
         NameValuePair,
         NameValuePair_var
       >
     NameValuePair_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:52
-  
+
   struct TAO_DynamicAny_Export NameValuePair
   {
     typedef NameValuePair_var _var_type;
-    
-    
+
+
     TAO_String_Manager id;
     CORBA::Any value;
   };
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_DYNAMICANY_NAMEVALUEPAIRSEQ_CH_)
 #define _DYNAMICANY_NAMEVALUEPAIRSEQ_CH_
-  
+
   class NameValuePairSeq;
-  
+
   typedef
     TAO_VarSeq_Var_T<
         NameValuePairSeq,
         NameValuePair
       >
     NameValuePairSeq_var;
-  
+
   typedef
     TAO_Seq_Out_T<
         NameValuePairSeq,
@@ -1168,7 +1168,7 @@ namespace DynamicAny
         NameValuePair
       >
     NameValuePairSeq_out;
-  
+
   class TAO_DynamicAny_Export NameValuePairSeq
     : public
         TAO_Unbounded_Sequence<
@@ -1181,62 +1181,62 @@ namespace DynamicAny
     NameValuePairSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        NameValuePair* buffer, 
+        NameValuePair* buffer,
         CORBA::Boolean release = 0
       );
     NameValuePairSeq (const NameValuePairSeq &);
     ~NameValuePairSeq (void);
-    
+
     typedef NameValuePairSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct NameDynAnyPair;
-  
+
   typedef
     TAO_Var_Var_T<
         NameDynAnyPair
       >
     NameDynAnyPair_var;
-  
+
   typedef
     TAO_Out_T<
         NameDynAnyPair,
         NameDynAnyPair_var
       >
     NameDynAnyPair_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:52
-  
+
   struct TAO_DynamicAny_Export NameDynAnyPair
   {
     typedef NameDynAnyPair_var _var_type;
-    
-    
+
+
     TAO_String_Manager id;
     DynamicAny::DynAny_var value;
   };
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_DYNAMICANY_NAMEDYNANYPAIRSEQ_CH_)
 #define _DYNAMICANY_NAMEDYNANYPAIRSEQ_CH_
-  
+
   class NameDynAnyPairSeq;
-  
+
   typedef
     TAO_VarSeq_Var_T<
         NameDynAnyPairSeq,
         NameDynAnyPair
       >
     NameDynAnyPairSeq_var;
-  
+
   typedef
     TAO_Seq_Out_T<
         NameDynAnyPairSeq,
@@ -1244,7 +1244,7 @@ namespace DynamicAny
         NameDynAnyPair
       >
     NameDynAnyPairSeq_out;
-  
+
   class TAO_DynamicAny_Export NameDynAnyPairSeq
     : public
         TAO_Unbounded_Sequence<
@@ -1257,32 +1257,32 @@ namespace DynamicAny
     NameDynAnyPairSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        NameDynAnyPair* buffer, 
+        NameDynAnyPair* buffer,
         CORBA::Boolean release = 0
       );
     NameDynAnyPairSeq (const NameDynAnyPairSeq &);
     ~NameDynAnyPairSeq (void);
-    
+
     typedef NameDynAnyPairSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_DYNAMICANY_DYNSTRUCT__VAR_OUT_CH_)
 #define _DYNAMICANY_DYNSTRUCT__VAR_OUT_CH_
-  
+
   class DynStruct;
   typedef DynStruct *DynStruct_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         DynStruct
       >
     DynStruct_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         DynStruct
@@ -1290,45 +1290,45 @@ namespace DynamicAny
     DynStruct_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_DYNAMICANY_DYNSTRUCT_CH_)
 #define _DYNAMICANY_DYNSTRUCT_CH_
-  
+
   class TAO_DynamicAny_Export DynStruct
     : public virtual ::DynamicAny::DynAny
   {
   public:
     typedef DynStruct_ptr _ptr_type;
     typedef DynStruct_var _var_type;
-    
+
     // The static operations.
     static DynStruct_ptr _duplicate (DynStruct_ptr obj);
-    
+
     static void _tao_release (DynStruct_ptr obj);
-    
+
     static DynStruct_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DynStruct_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DynStruct_ptr _nil (void)
     {
       return static_cast<DynStruct_ptr> (0);
     }
-    
-    
-    
+
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual char * current_member_name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -1337,10 +1337,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::TCKind current_member_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -1349,20 +1349,20 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // 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
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void set_members (
         const ::DynamicAny::NameValuePairSeq & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1372,20 +1372,20 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // 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
     // 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
@@ -1395,48 +1395,48 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     DynStruct (void);
-    
+
     virtual ~DynStruct (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     DynStruct (const DynStruct &);
-    
+
     void operator= (const DynStruct &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_DYNAMICANY_DYNUNION__VAR_OUT_CH_)
 #define _DYNAMICANY_DYNUNION__VAR_OUT_CH_
-  
+
   class DynUnion;
   typedef DynUnion *DynUnion_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         DynUnion
       >
     DynUnion_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         DynUnion
@@ -1444,55 +1444,55 @@ namespace DynamicAny
     DynUnion_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_DYNAMICANY_DYNUNION_CH_)
 #define _DYNAMICANY_DYNUNION_CH_
-  
+
   class TAO_DynamicAny_Export DynUnion
     : public virtual ::DynamicAny::DynAny
   {
   public:
     typedef DynUnion_ptr _ptr_type;
     typedef DynUnion_var _var_type;
-    
+
     // The static operations.
     static DynUnion_ptr _duplicate (DynUnion_ptr obj);
-    
+
     static void _tao_release (DynUnion_ptr obj);
-    
+
     static DynUnion_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DynUnion_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DynUnion_ptr _nil (void)
     {
       return static_cast<DynUnion_ptr> (0);
     }
-    
-    
-    
+
+
+
     // TAO_IDL - Generated from
     // 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
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void set_discriminator (
         ::DynamicAny::DynAny_ptr d
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1501,10 +1501,10 @@ namespace DynamicAny
         CORBA::SystemException,
         ::DynamicAny::DynAny::TypeMismatch
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void set_to_default_member (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -1512,10 +1512,10 @@ namespace DynamicAny
         CORBA::SystemException,
         ::DynamicAny::DynAny::TypeMismatch
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void set_to_no_active_member (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -1523,30 +1523,30 @@ namespace DynamicAny
         CORBA::SystemException,
         ::DynamicAny::DynAny::TypeMismatch
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // 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;
-    
+
     // TAO_IDL - Generated from
     // 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
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::DynamicAny::DynAny_ptr member (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -1554,10 +1554,10 @@ namespace DynamicAny
         CORBA::SystemException,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual char * member_name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -1565,10 +1565,10 @@ namespace DynamicAny
         CORBA::SystemException,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::TCKind member_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -1576,48 +1576,48 @@ namespace DynamicAny
         CORBA::SystemException,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     DynUnion (void);
-    
+
     virtual ~DynUnion (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     DynUnion (const DynUnion &);
-    
+
     void operator= (const DynUnion &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_DYNAMICANY_ANYSEQ_CH_)
 #define _DYNAMICANY_ANYSEQ_CH_
-  
+
   class AnySeq;
-  
+
   typedef
     TAO_VarSeq_Var_T<
         AnySeq,
         CORBA::Any
       >
     AnySeq_var;
-  
+
   typedef
     TAO_Seq_Out_T<
         AnySeq,
@@ -1625,7 +1625,7 @@ namespace DynamicAny
         CORBA::Any
       >
     AnySeq_out;
-  
+
   class TAO_DynamicAny_Export AnySeq
     : public
         TAO_Unbounded_Sequence<
@@ -1638,25 +1638,25 @@ namespace DynamicAny
     AnySeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        CORBA::Any* buffer, 
+        CORBA::Any* buffer,
         CORBA::Boolean release = 0
       );
     AnySeq (const AnySeq &);
     ~AnySeq (void);
-    
+
     typedef AnySeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_DYNAMICANY_DYNANYSEQ_CH_)
 #define _DYNAMICANY_DYNANYSEQ_CH_
-  
+
   class DynAnySeq;
-  
+
   typedef
     TAO_MngSeq_Var_T<
         DynAnySeq,
@@ -1666,7 +1666,7 @@ namespace DynamicAny
           >
       >
     DynAnySeq_var;
-  
+
   typedef
     TAO_MngSeq_Out_T<
         DynAnySeq,
@@ -1677,7 +1677,7 @@ namespace DynamicAny
           >
       >
     DynAnySeq_out;
-  
+
   class TAO_DynamicAny_Export DynAnySeq
     : public
         TAO_Unbounded_Object_Sequence<
@@ -1691,32 +1691,32 @@ namespace DynamicAny
     DynAnySeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        DynAny_ptr* buffer, 
+        DynAny_ptr* buffer,
         CORBA::Boolean release = 0
       );
     DynAnySeq (const DynAnySeq &);
     ~DynAnySeq (void);
-    
+
     typedef DynAnySeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_DYNAMICANY_DYNSEQUENCE__VAR_OUT_CH_)
 #define _DYNAMICANY_DYNSEQUENCE__VAR_OUT_CH_
-  
+
   class DynSequence;
   typedef DynSequence *DynSequence_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         DynSequence
       >
     DynSequence_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         DynSequence
@@ -1724,55 +1724,55 @@ namespace DynamicAny
     DynSequence_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_DYNAMICANY_DYNSEQUENCE_CH_)
 #define _DYNAMICANY_DYNSEQUENCE_CH_
-  
+
   class TAO_DynamicAny_Export DynSequence
     : public virtual ::DynamicAny::DynAny
   {
   public:
     typedef DynSequence_ptr _ptr_type;
     typedef DynSequence_var _var_type;
-    
+
     // The static operations.
     static DynSequence_ptr _duplicate (DynSequence_ptr obj);
-    
+
     static void _tao_release (DynSequence_ptr obj);
-    
+
     static DynSequence_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DynSequence_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DynSequence_ptr _nil (void)
     {
       return static_cast<DynSequence_ptr> (0);
     }
-    
-    
-    
+
+
+
     // TAO_IDL - Generated from
     // 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
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void set_length (
         ::CORBA::ULong len
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1781,20 +1781,20 @@ namespace DynamicAny
         CORBA::SystemException,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // 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
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void set_elements (
         const ::DynamicAny::AnySeq & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1804,20 +1804,20 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // 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
     // 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
@@ -1827,48 +1827,48 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     DynSequence (void);
-    
+
     virtual ~DynSequence (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     DynSequence (const DynSequence &);
-    
+
     void operator= (const DynSequence &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_DYNAMICANY_DYNARRAY__VAR_OUT_CH_)
 #define _DYNAMICANY_DYNARRAY__VAR_OUT_CH_
-  
+
   class DynArray;
   typedef DynArray *DynArray_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         DynArray
       >
     DynArray_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         DynArray
@@ -1876,55 +1876,55 @@ namespace DynamicAny
     DynArray_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_DYNAMICANY_DYNARRAY_CH_)
 #define _DYNAMICANY_DYNARRAY_CH_
-  
+
   class TAO_DynamicAny_Export DynArray
     : public virtual ::DynamicAny::DynAny
   {
   public:
     typedef DynArray_ptr _ptr_type;
     typedef DynArray_var _var_type;
-    
+
     // The static operations.
     static DynArray_ptr _duplicate (DynArray_ptr obj);
-    
+
     static void _tao_release (DynArray_ptr obj);
-    
+
     static DynArray_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DynArray_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DynArray_ptr _nil (void)
     {
       return static_cast<DynArray_ptr> (0);
     }
-    
-    
-    
+
+
+
     // TAO_IDL - Generated from
     // 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
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void set_elements (
         const ::DynamicAny::AnySeq & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1934,20 +1934,20 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // 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
     // 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
@@ -1957,48 +1957,48 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     DynArray (void);
-    
+
     virtual ~DynArray (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     DynArray (const DynArray &);
-    
+
     void operator= (const DynArray &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_DYNAMICANY_DYNVALUE__VAR_OUT_CH_)
 #define _DYNAMICANY_DYNVALUE__VAR_OUT_CH_
-  
+
   class DynValue;
   typedef DynValue *DynValue_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         DynValue
       >
     DynValue_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         DynValue
@@ -2006,45 +2006,45 @@ namespace DynamicAny
     DynValue_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_DYNAMICANY_DYNVALUE_CH_)
 #define _DYNAMICANY_DYNVALUE_CH_
-  
+
   class TAO_DynamicAny_Export DynValue
     : public virtual ::DynamicAny::DynAny
   {
   public:
     typedef DynValue_ptr _ptr_type;
     typedef DynValue_var _var_type;
-    
+
     // The static operations.
     static DynValue_ptr _duplicate (DynValue_ptr obj);
-    
+
     static void _tao_release (DynValue_ptr obj);
-    
+
     static DynValue_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DynValue_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DynValue_ptr _nil (void)
     {
       return static_cast<DynValue_ptr> (0);
     }
-    
-    
-    
+
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual char * current_member_name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -2053,10 +2053,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::TCKind current_member_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -2065,20 +2065,20 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // 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
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void set_members (
         const ::DynamicAny::NameValuePairSeq & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2088,20 +2088,20 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // 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
     // 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
@@ -2111,48 +2111,48 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     DynValue (void);
-    
+
     virtual ~DynValue (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     DynValue (const DynValue &);
-    
+
     void operator= (const DynValue &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_DYNAMICANY_DYNANYFACTORY__VAR_OUT_CH_)
 #define _DYNAMICANY_DYNANYFACTORY__VAR_OUT_CH_
-  
+
   class DynAnyFactory;
   typedef DynAnyFactory *DynAnyFactory_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         DynAnyFactory
       >
     DynAnyFactory_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         DynAnyFactory
@@ -2160,63 +2160,63 @@ namespace DynamicAny
     DynAnyFactory_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_DYNAMICANY_DYNANYFACTORY_CH_)
 #define _DYNAMICANY_DYNANYFACTORY_CH_
-  
+
   class TAO_DynamicAny_Export DynAnyFactory
     : public virtual CORBA::Object
   {
   public:
     typedef DynAnyFactory_ptr _ptr_type;
     typedef DynAnyFactory_var _var_type;
-    
+
     // The static operations.
     static DynAnyFactory_ptr _duplicate (DynAnyFactory_ptr obj);
-    
+
     static void _tao_release (DynAnyFactory_ptr obj);
-    
+
     static DynAnyFactory_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DynAnyFactory_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DynAnyFactory_ptr _nil (void)
     {
       return static_cast<DynAnyFactory_ptr> (0);
     }
-    
-    
-    
+
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_DYNAMICANY_DYNANYFACTORY_INCONSISTENTTYPECODE_CH_)
 #define _DYNAMICANY_DYNANYFACTORY_INCONSISTENTTYPECODE_CH_
-    
+
     class TAO_DynamicAny_Export InconsistentTypeCode : public CORBA::UserException
     {
     public:
-      
+
       InconsistentTypeCode (void);
       InconsistentTypeCode (const InconsistentTypeCode &);
       ~InconsistentTypeCode (void);
 
       InconsistentTypeCode &operator= (const InconsistentTypeCode &);
-      
+
       static InconsistentTypeCode *_downcast (CORBA::Exception *);
       static const InconsistentTypeCode *_downcast (CORBA::Exception const *);
-      
+
       static CORBA::Exception *_alloc (void);
-      
+
       virtual CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
@@ -2225,21 +2225,21 @@ namespace DynamicAny
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:127
     };
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // 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
@@ -2248,10 +2248,10 @@ namespace DynamicAny
         CORBA::SystemException,
         ::DynamicAny::DynAnyFactory::InconsistentTypeCode
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // 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
@@ -2260,28 +2260,28 @@ namespace DynamicAny
         CORBA::SystemException,
         ::DynamicAny::DynAnyFactory::InconsistentTypeCode
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     DynAnyFactory (void);
-    
+
     virtual ~DynAnyFactory (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     DynAnyFactory (const DynAnyFactory &);
-    
+
     void operator= (const DynAnyFactory &);
   };
 
@@ -2301,7 +2301,7 @@ namespace TAO
 
 #if !defined (_DYNAMICANY_DYNANY__TRAITS_CH_)
 #define _DYNAMICANY_DYNANY__TRAITS_CH_
-  
+
   template<>
   struct TAO_DynamicAny_Export Objref_Traits< ::DynamicAny::DynAny>
   {
@@ -2322,7 +2322,7 @@ namespace TAO
 
 #if !defined (_DYNAMICANY_DYNFIXED__TRAITS_CH_)
 #define _DYNAMICANY_DYNFIXED__TRAITS_CH_
-  
+
   template<>
   struct TAO_DynamicAny_Export Objref_Traits< ::DynamicAny::DynFixed>
   {
@@ -2343,7 +2343,7 @@ namespace TAO
 
 #if !defined (_DYNAMICANY_DYNENUM__TRAITS_CH_)
 #define _DYNAMICANY_DYNENUM__TRAITS_CH_
-  
+
   template<>
   struct TAO_DynamicAny_Export Objref_Traits< ::DynamicAny::DynEnum>
   {
@@ -2364,7 +2364,7 @@ namespace TAO
 
 #if !defined (_DYNAMICANY_DYNSTRUCT__TRAITS_CH_)
 #define _DYNAMICANY_DYNSTRUCT__TRAITS_CH_
-  
+
   template<>
   struct TAO_DynamicAny_Export Objref_Traits< ::DynamicAny::DynStruct>
   {
@@ -2385,7 +2385,7 @@ namespace TAO
 
 #if !defined (_DYNAMICANY_DYNUNION__TRAITS_CH_)
 #define _DYNAMICANY_DYNUNION__TRAITS_CH_
-  
+
   template<>
   struct TAO_DynamicAny_Export Objref_Traits< ::DynamicAny::DynUnion>
   {
@@ -2406,7 +2406,7 @@ namespace TAO
 
 #if !defined (_DYNAMICANY_DYNSEQUENCE__TRAITS_CH_)
 #define _DYNAMICANY_DYNSEQUENCE__TRAITS_CH_
-  
+
   template<>
   struct TAO_DynamicAny_Export Objref_Traits< ::DynamicAny::DynSequence>
   {
@@ -2427,7 +2427,7 @@ namespace TAO
 
 #if !defined (_DYNAMICANY_DYNARRAY__TRAITS_CH_)
 #define _DYNAMICANY_DYNARRAY__TRAITS_CH_
-  
+
   template<>
   struct TAO_DynamicAny_Export Objref_Traits< ::DynamicAny::DynArray>
   {
@@ -2448,7 +2448,7 @@ namespace TAO
 
 #if !defined (_DYNAMICANY_DYNVALUE__TRAITS_CH_)
 #define _DYNAMICANY_DYNVALUE__TRAITS_CH_
-  
+
   template<>
   struct TAO_DynamicAny_Export Objref_Traits< ::DynamicAny::DynValue>
   {
@@ -2469,7 +2469,7 @@ namespace TAO
 
 #if !defined (_DYNAMICANY_DYNANYFACTORY__TRAITS_CH_)
 #define _DYNAMICANY_DYNANYFACTORY__TRAITS_CH_
-  
+
   template<>
   struct TAO_DynamicAny_Export Objref_Traits< ::DynamicAny::DynAnyFactory>
   {
diff --git a/TAO/tao/DynamicC.cpp b/TAO/tao/DynamicC.cpp
deleted file mode 100644
index 30656ccf787..00000000000
--- a/TAO/tao/DynamicC.cpp
+++ /dev/null
@@ -1,296 +0,0 @@
-// -*- 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/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "DynamicC.h"
-#include "tao/CDR.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:70
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_DYNAMIC_PARAMETERLIST_CS_)
-#define _DYNAMIC_PARAMETERLIST_CS_
-
-Dynamic::ParameterList::ParameterList (void)
-{}
-
-Dynamic::ParameterList::ParameterList (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        Dynamic::Parameter
-      >
-    (max)
-{}
-
-Dynamic::ParameterList::ParameterList (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    Dynamic::Parameter * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        Dynamic::Parameter
-      >
-    (max, length, buffer, release)
-{}
-
-Dynamic::ParameterList::ParameterList (
-    const ParameterList &seq
-  )
-  : TAO_Unbounded_Sequence<
-        Dynamic::Parameter
-      >
-    (seq)
-{}
-
-Dynamic::ParameterList::~ParameterList (void)
-{}
-
-void Dynamic::ParameterList::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  ParameterList * _tao_tmp_pointer =
-    static_cast<ParameterList *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_DYNAMIC_EXCEPTIONLIST_CS_)
-#define _DYNAMIC_EXCEPTIONLIST_CS_
-
-Dynamic::ExceptionList::ExceptionList (void)
-{}
-
-Dynamic::ExceptionList::ExceptionList (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Pseudo_Sequence<
-        CORBA::TypeCode
-      >
-    (max)
-{}
-
-Dynamic::ExceptionList::ExceptionList (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::TypeCode_ptr * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Pseudo_Sequence<
-        CORBA::TypeCode
-      >
-    (max, length, buffer, release)
-{}
-
-Dynamic::ExceptionList::ExceptionList (
-    const ExceptionList &seq
-  )
-  : TAO_Unbounded_Pseudo_Sequence<
-        CORBA::TypeCode
-      >
-    (seq)
-{}
-
-Dynamic::ExceptionList::~ExceptionList (void)
-{}
-
-void Dynamic::ExceptionList::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  ExceptionList * _tao_tmp_pointer =
-    static_cast<ExceptionList *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_Dynamic_ParameterList_CPP_
-#define _TAO_CDR_OP_Dynamic_ParameterList_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const Dynamic::ParameterList &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      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 false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    Dynamic::ParameterList &_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 false;
-        }
-      
-      // 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 true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      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 false;
-}
-
-#endif /* _TAO_CDR_OP_Dynamic_ParameterList_CPP_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_Dynamic_ExceptionList_CPP_
-#define _TAO_CDR_OP_Dynamic_ExceptionList_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const Dynamic::ExceptionList &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      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 false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    Dynamic::ExceptionList &_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 false;
-        }
-      
-      // 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 true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      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 false;
-}
-
-#endif /* _TAO_CDR_OP_Dynamic_ExceptionList_CPP_ */
diff --git a/TAO/tao/DynamicC.h b/TAO/tao/DynamicC.h
deleted file mode 100644
index c9e70f316ed..00000000000
--- a/TAO/tao/DynamicC.h
+++ /dev/null
@@ -1,288 +0,0 @@
-// -*- 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/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_DYNAMICC_H_
-#define _TAO_IDL_ORIG_DYNAMICC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-#include "tao/TypeCode.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Sequence_T.h"
-#include "tao/Seq_Var_T.h"
-#include "tao/Seq_Out_T.h"
-
-#include "tao/Dynamic_ParameterC.h"
-#include "tao/StringSeqC.h"
-#include "tao/Typecode_typesC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#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
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace Dynamic
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_DYNAMIC_PARAMETERLIST_CH_)
-#define _DYNAMIC_PARAMETERLIST_CH_
-  
-  class ParameterList;
-  
-  typedef
-    TAO_VarSeq_Var_T<
-        ParameterList,
-        Parameter
-      >
-    ParameterList_var;
-  
-  typedef
-    TAO_Seq_Out_T<
-        ParameterList,
-        ParameterList_var,
-        Parameter
-      >
-    ParameterList_out;
-  
-  class TAO_Export ParameterList
-    : public
-        TAO_Unbounded_Sequence<
-            Parameter
-          >
-  {
-  public:
-    ParameterList (void);
-    ParameterList (CORBA::ULong max);
-    ParameterList (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        Parameter* buffer, 
-        CORBA::Boolean release = 0
-      );
-    ParameterList (const ParameterList &);
-    ~ParameterList (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef ParameterList_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ParameterList;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:472
-  
-  typedef CORBA::StringSeq ContextList;
-  typedef CORBA::StringSeq_var ContextList_var;
-  typedef CORBA::StringSeq_out ContextList_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ContextList;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_DYNAMIC_EXCEPTIONLIST_CH_)
-#define _DYNAMIC_EXCEPTIONLIST_CH_
-  
-  class ExceptionList;
-  
-  typedef
-    TAO_MngSeq_Var_T<
-        ExceptionList,
-        TAO_Pseudo_Object_Manager<
-            CORBA::TypeCode
-          >
-      >
-    ExceptionList_var;
-  
-  typedef
-    TAO_MngSeq_Out_T<
-        ExceptionList,
-        ExceptionList_var,
-        TAO_Pseudo_Object_Manager<
-            CORBA::TypeCode
-          >
-      >
-    ExceptionList_out;
-  
-  class TAO_Export ExceptionList
-    : public
-        TAO_Unbounded_Pseudo_Sequence<
-            CORBA::TypeCode
-          >
-  {
-  public:
-    ExceptionList (void);
-    ExceptionList (CORBA::ULong max);
-    ExceptionList (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA::TypeCode_ptr* buffer, 
-        CORBA::Boolean release = 0
-      );
-    ExceptionList (const ExceptionList &);
-    ~ExceptionList (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef ExceptionList_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ExceptionList;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:472
-  
-  typedef CORBA::StringSeq RequestContext;
-  typedef CORBA::StringSeq_var RequestContext_var;
-  typedef CORBA::StringSeq_out RequestContext_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_RequestContext;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module Dynamic
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// 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
-// 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
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_Dynamic_ParameterList_H_
-#define _TAO_CDR_OP_Dynamic_ParameterList_H_
-
-TAO_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const Dynamic::ParameterList &
-  );
-TAO_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    Dynamic::ParameterList &
-  );
-
-#endif /* _TAO_CDR_OP_Dynamic_ParameterList_H_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_Dynamic_ExceptionList_H_
-#define _TAO_CDR_OP_Dynamic_ExceptionList_H_
-
-TAO_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const Dynamic::ExceptionList &
-  );
-TAO_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    Dynamic::ExceptionList &
-  );
-
-#endif /* _TAO_CDR_OP_Dynamic_ExceptionList_H_ */
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#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/DynamicInterface.mpc b/TAO/tao/DynamicInterface.mpc
index 3c5a4cd6488..ecb988813ac 100644
--- a/TAO/tao/DynamicInterface.mpc
+++ b/TAO/tao/DynamicInterface.mpc
@@ -8,7 +8,7 @@ project : taolib, core, messaging, minimum_corba {
   }
 
   Header_Files {
-    DynamicInterface 
+    DynamicInterface
   }
 
   Inline_Files {
@@ -26,6 +26,9 @@ project : taolib, core, messaging, minimum_corba {
   PIDL_Files {
   }
 
+  IDL_Files {
+  }
+
   Pkgconfig_Files {
     DynamicInterface/TAO_DynamicInterface.pc.in
   }
diff --git a/TAO/tao/DynamicInterface/Context.cpp b/TAO/tao/DynamicInterface/Context.cpp
index 96b5c1be43b..2e47f392f5f 100644
--- a/TAO/tao/DynamicInterface/Context.cpp
+++ b/TAO/tao/DynamicInterface/Context.cpp
@@ -4,7 +4,7 @@ ACE_RCSID (DynamicInterface,
            Context,
            "$Id$")
 
-#include "tao/TypeCode.h"
+#include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/Environment.h"
 #include "tao/CORBA_String.h"
 #include "tao/SystemException.h"
diff --git a/TAO/tao/DynamicInterface/DII_Arguments.cpp b/TAO/tao/DynamicInterface/DII_Arguments.cpp
index f4f6941ad97..02b362ed53b 100644
--- a/TAO/tao/DynamicInterface/DII_Arguments.cpp
+++ b/TAO/tao/DynamicInterface/DII_Arguments.cpp
@@ -2,11 +2,11 @@
 
 #include "DII_Arguments.h"
 
-#include "tao/NVList.h"
-#include "tao/Any_Impl.h"
+#include "tao/AnyTypeCode/NVList.h"
+#include "tao/AnyTypeCode/Any_Impl.h"
 #include "tao/Exception.h"
 #include "tao/CDR.h"
-#include "tao/DynamicC.h"
+#include "tao/AnyTypeCode/DynamicC.h"
 
 ACE_RCSID (DynamicInterface,
            DII_Arguments,
@@ -44,7 +44,7 @@ namespace TAO
   }
 
   void
-  NamedValue_Argument::interceptor_result (CORBA::Any *any)
+  NamedValue_Argument::interceptor_value (CORBA::Any *any) const
   {
     (*any) <<= *this->x_->value ();
   }
diff --git a/TAO/tao/DynamicInterface/DII_Arguments.h b/TAO/tao/DynamicInterface/DII_Arguments.h
index b15ccca1a03..cf681244b44 100644
--- a/TAO/tao/DynamicInterface/DII_Arguments.h
+++ b/TAO/tao/DynamicInterface/DII_Arguments.h
@@ -42,14 +42,14 @@ namespace TAO
    *
    * @brief Class for the return value of a CORBA::(Server)Request.
    */
-  class NamedValue_Argument : public Argument
+  class NamedValue_Argument : public RetArgument
   {
   public:
     NamedValue_Argument (CORBA::NamedValue_ptr);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 
-    virtual void interceptor_result (CORBA::Any *);
+    virtual void interceptor_value (CORBA::Any *any) const;
 
     int byte_order (void) const;
 
@@ -65,13 +65,13 @@ namespace TAO
    *
    * @brief Class for the argument list of a CORBA::(Server)Request.
    */
-  class NVList_Argument : public Argument
+  class NVList_Argument : public InArgument
   {
   public:
     NVList_Argument (CORBA::NVList_ptr,
                      bool lazy_eval);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 
diff --git a/TAO/tao/DynamicInterface/DII_Invocation.cpp b/TAO/tao/DynamicInterface/DII_Invocation.cpp
index 794f3b95271..f07ff022182 100644
--- a/TAO/tao/DynamicInterface/DII_Invocation.cpp
+++ b/TAO/tao/DynamicInterface/DII_Invocation.cpp
@@ -7,18 +7,21 @@
 #include "Request.h"
 #include "DII_Reply_Dispatcher.h"
 
-#include "tao/DynamicC.h"
-#include "tao/TypeCode.h"
+#include "tao/AnyTypeCode/DynamicC.h"
+#include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/operation_details.h"
-#include "tao/RequestInfo_Util.h"
 #include "tao/Invocation_Utils.h"
 #include "tao/debug.h"
-#include "tao/Any_Unknown_IDL_Type.h"
+#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/Profile_Transport_Resolver.h"
 #include "tao/ORB_Constants.h"
 
 #include "ace/OS_NS_string.h"
 
+#if TAO_HAS_INTERCEPTORS == 1
+# include "tao/PI/RequestInfo_Util.h"
+#endif
+
 ACE_RCSID (DynamicInterface,
            DII_Invocation,
            "$Id$")
diff --git a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp
index fccf4777bde..e8fa30d8e3f 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp
+++ b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp
@@ -98,7 +98,7 @@ TAO_DynamicImplementation::_create_stub (ACE_ENV_SINGLE_ARG_DECL)
   // exception. See the CORBA C++ mapping, section 1.38.3.
   TAO::Portable_Server::POA_Current_Impl *poa_current_impl =
     static_cast <TAO::Portable_Server::POA_Current_Impl *>
-                     (TAO_TSS_RESOURCES::instance ()->poa_current_impl_);
+                     (TAO_TSS_Resources::instance ()->poa_current_impl_);
 
   if (poa_current_impl == 0
       || this != poa_current_impl->servant ())
@@ -199,7 +199,7 @@ TAO_DynamicImplementation::get_id_from_primary_interface (
   // exception. See the CORBA C++ mapping, section 1.38.3.
   TAO::Portable_Server::POA_Current_Impl *poa_current_impl =
     static_cast <TAO::Portable_Server::POA_Current_Impl *>
-                     (TAO_TSS_RESOURCES::instance ()->poa_current_impl_);
+                     (TAO_TSS_Resources::instance ()->poa_current_impl_);
 
   if (poa_current_impl == 0
       || this != poa_current_impl->servant ())
diff --git a/TAO/tao/DynamicInterface/Dynamic_Implementation.h b/TAO/tao/DynamicInterface/Dynamic_Implementation.h
index 9c50fc9ce95..7e7ed6c0c67 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Implementation.h
+++ b/TAO/tao/DynamicInterface/Dynamic_Implementation.h
@@ -39,17 +39,19 @@ namespace CORBA
   typedef ServerRequest *ServerRequest_ptr;
 }
 
+/**
+ * @class TAO_DynamicImplementation
+ *
+ * @brief Base class for DSI.
+ *
+ * It is expected that the <invoke> and <_primary_interface>
+ * methods will be only invoked by the POA in the context of
+ * serving a CORBA request. Invoking this method in other
+ * circumstances may lead to unpredictable results.
+ */
 class TAO_DynamicInterface_Export TAO_DynamicImplementation
   : public virtual TAO_ServantBase
 {
-  // = TITLE
-  //    Base class for DSI.
-  //
-  // = DESCRIPTION
-  //    It is expected that the <invoke> and <_primary_interface>
-  //    methods will be only invoked by the POA in the context of
-  //    serving a CORBA request. Invoking this method in other
-  //    circumstances may lead to unpredictable results.
 public:
   /// The invoke() method receives requests issued to any CORBA object
   /// incarnated by the DSI servant and performs the processing
diff --git a/TAO/tao/DynamicInterface/ExceptionList.cpp b/TAO/tao/DynamicInterface/ExceptionList.cpp
index 34445946608..38b90ffec8f 100644
--- a/TAO/tao/DynamicInterface/ExceptionList.cpp
+++ b/TAO/tao/DynamicInterface/ExceptionList.cpp
@@ -4,7 +4,7 @@ ACE_RCSID (DynamicInterface,
            ExceptionList,
            "$Id$")
 
-#include "tao/TypeCode.h"
+#include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/Environment.h"
 #include "tao/SystemException.h"
 
diff --git a/TAO/tao/DynamicInterface/Request.cpp b/TAO/tao/DynamicInterface/Request.cpp
index c51c7b0f4f3..5e57536a687 100644
--- a/TAO/tao/DynamicInterface/Request.cpp
+++ b/TAO/tao/DynamicInterface/Request.cpp
@@ -10,10 +10,10 @@ ACE_RCSID (DynamicInterface,
 #include "DII_Arguments.h"
 #include "Context.h"
 
-#include "tao/NVList.h"
+#include "tao/AnyTypeCode/NVList.h"
 #include "tao/Object.h"
 #include "tao/Pluggable_Messaging_Utils.h"
-#include "tao/Any_Unknown_IDL_Type.h"
+#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
diff --git a/TAO/tao/DynamicInterface/Request.h b/TAO/tao/DynamicInterface/Request.h
index 3dad44d123a..32cf720983b 100644
--- a/TAO/tao/DynamicInterface/Request.h
+++ b/TAO/tao/DynamicInterface/Request.h
@@ -35,7 +35,7 @@
 #include "tao/Environment.h"
 #include "tao/Sequence.h"
 #include "tao/CDR.h"
-#include "tao/NVList.h"
+#include "tao/AnyTypeCode/NVList.h"
 
 #include "ace/SString.h"
 
diff --git a/TAO/tao/DynamicInterface/Server_Request.cpp b/TAO/tao/DynamicInterface/Server_Request.cpp
index 6bd85a21e5e..3a142008626 100644
--- a/TAO/tao/DynamicInterface/Server_Request.cpp
+++ b/TAO/tao/DynamicInterface/Server_Request.cpp
@@ -8,11 +8,11 @@ ACE_RCSID (DynamicInterface,
            Server_Request,
            "$Id$")
 
-#include "tao/NVList.h"
+#include "tao/AnyTypeCode/NVList.h"
 #include "tao/GIOP_Utils.h"
-#include "tao/Marshal.h"
-#include "tao/TypeCode.h"
-#include "tao/Any_Impl.h"
+#include "tao/AnyTypeCode/Marshal.h"
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/AnyTypeCode/Any_Impl.h"
 #include "tao/SystemException.h"
 
 #if !defined (__ACE_INLINE__)
diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp
index 57107224f2c..bcc01200d6a 100644
--- a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp
+++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp
@@ -2,12 +2,12 @@
 
 #include "Unknown_User_Exception.h"
 
-#include "tao/Any.h"
+#include "tao/AnyTypeCode/Any.h"
 #include "tao/Environment.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/Struct_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
+#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
 #include "tao/SystemException.h"
 
 #include "ace/OS_NS_string.h"
@@ -55,16 +55,6 @@ CORBA::UnknownUserException::exception (void)
   return *this->exception_;
 }
 
-int
-CORBA::UnknownUserException::_is_a (const char *interface_id) const
-{
-  return
-    ((ACE_OS::strcmp (interface_id,
-                      "IDL:omg.org/CORBA/UnknownUserException:1.0")
-        == 0)
-      || UserException::_is_a (interface_id));
-}
-
 CORBA::UnknownUserException *
 CORBA::UnknownUserException::_downcast (CORBA::Exception *ex)
 {
diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.h b/TAO/tao/DynamicInterface/Unknown_User_Exception.h
index 91d06d3e7a0..1976000db16 100644
--- a/TAO/tao/DynamicInterface/Unknown_User_Exception.h
+++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.h
@@ -89,9 +89,6 @@ namespace CORBA
 
     // = TAO specific extension.
 
-    /// Helper method to implement _downcast.
-    virtual int _is_a (const char *type_id) const;
-
     /// This class has a specific typecode.
     virtual CORBA::TypeCode_ptr _tao_type (void) const;
 
diff --git a/TAO/tao/Dynamic_Adapter.cpp b/TAO/tao/Dynamic_Adapter.cpp
index 4db3657cee7..b51e0008ca8 100644
--- a/TAO/tao/Dynamic_Adapter.cpp
+++ b/TAO/tao/Dynamic_Adapter.cpp
@@ -1,23 +1,12 @@
 // @(#) $Id$
 
 #include "tao/Dynamic_Adapter.h"
-#include "tao/ORB_Core.h"
-#include "ace/Dynamic_Service.h"
 
-ACE_RCSID (tao, 
-           Dynamic_Adapter, 
+ACE_RCSID (tao,
+           Dynamic_Adapter,
            "$Id$")
 
 TAO_Dynamic_Adapter::~TAO_Dynamic_Adapter (void)
 {
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Dynamic_Service<TAO_Dynamic_Adapter>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Dynamic_Service<TAO_Dynamic_Adapter>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Dynamic_Parameter.pidl b/TAO/tao/Dynamic_Parameter.pidl
deleted file mode 100644
index f82dd8ba366..00000000000
--- a/TAO/tao/Dynamic_Parameter.pidl
+++ /dev/null
@@ -1,41 +0,0 @@
-// -*- IDL -*-
-
-// ================================================================
-/**
- *  @file   Dynamic_Parameter.pidl
- *
- * $Id$
- *
- *   This file was used to generate the code in Dynamic_ParameterC.* The command
- *   used to generate code is:
- *
- *     tao_idl
- *        -o orig -Ge 1 -GA -Sc -Sci
- *          -Wb,export_macro=TAO_Export
- *          -Wb,export_include="tao/TAO_Export.h"
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          Dynamic_Parameter.pidl
- *
- */
-// ================================================================
-
-// File: Dynamic_Parameter.idl
-// Piece of module Dynamic generated separately for use by
-// template argument helper classes.
-
-#ifndef _DYNAMIC_PARAMETER_IDL_
-#define _DYNAMIC_PARAMETER_IDL_
-
-#include <ParameterMode.pidl>
-
-module Dynamic
-{
-  struct Parameter
-  {
-    any argument;
-    CORBA::ParameterMode mode;
-  };
-};
-
-#endif // _DYNAMIC_PARAMETER_IDL_
diff --git a/TAO/tao/Dynamic_ParameterA.cpp b/TAO/tao/Dynamic_ParameterA.cpp
deleted file mode 100644
index 672a92e1ed7..00000000000
--- a/TAO/tao/Dynamic_ParameterA.cpp
+++ /dev/null
@@ -1,123 +0,0 @@
-// -*- 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/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "Dynamic_ParameterC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/Recursive_Type_TypeCode.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_Dynamic_Parameter[] =
-  {
-    { "argument", &CORBA::_tc_any },
-    { "mode", &CORBA::_tc_ParameterMode }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_Dynamic_Parameter (
-    CORBA::tk_struct,
-    "IDL:Dynamic/Parameter:1.0",
-    "Parameter",
-    _tao_fields_Dynamic_Parameter,
-    2);
-  
-namespace Dynamic
-{
-  ::CORBA::TypeCode_ptr const _tc_Parameter =
-    &_tao_tc_Dynamic_Parameter;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const Dynamic::Parameter &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<Dynamic::Parameter>::insert_copy (
-      _tao_any,
-      Dynamic::Parameter::_tao_any_destructor,
-      Dynamic::_tc_Parameter,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    Dynamic::Parameter *_tao_elem
-  )
-{
-  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).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    Dynamic::Parameter *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const Dynamic::Parameter *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const Dynamic::Parameter *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<Dynamic::Parameter>::extract (
-        _tao_any,
-        Dynamic::Parameter::_tao_any_destructor,
-        Dynamic::_tc_Parameter,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/Dynamic_ParameterC.cpp b/TAO/tao/Dynamic_ParameterC.cpp
deleted file mode 100644
index b681433ed5e..00000000000
--- a/TAO/tao/Dynamic_ParameterC.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-// -*- 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/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "Dynamic_ParameterC.h"
-#include "tao/CDR.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:70
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
-
-void 
-Dynamic::Parameter::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  Parameter *_tao_tmp_pointer =
-    static_cast<Parameter *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const Dynamic::Parameter &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.argument) &&
-    (strm << _tao_aggregate.mode);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    Dynamic::Parameter &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.argument) &&
-    (strm >> _tao_aggregate.mode);
-}
diff --git a/TAO/tao/Dynamic_ParameterC.h b/TAO/tao/Dynamic_ParameterC.h
deleted file mode 100644
index bf19a801e48..00000000000
--- a/TAO/tao/Dynamic_ParameterC.h
+++ /dev/null
@@ -1,149 +0,0 @@
-// -*- 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/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_DYNAMIC_PARAMETERC_H_
-#define _TAO_IDL_ORIG_DYNAMIC_PARAMETERC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Any.h"
-#include "tao/VarOut_T.h"
-
-#include "tao/ParameterModeC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#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
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace Dynamic
-{
-
-  // TAO_IDL - Generated from
-  // be\be_type.cpp:258
-
-  struct Parameter;
-
-  typedef
-    TAO_Var_Var_T<
-        Parameter
-      >
-    Parameter_var;
-
-  typedef
-    TAO_Out_T<
-        Parameter,
-        Parameter_var
-      >
-    Parameter_out;
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-
-  struct TAO_Export Parameter
-  {
-    typedef Parameter_var _var_type;
-
-    static void _tao_any_destructor (void *);
-    CORBA::Any argument;
-    CORBA::ParameterMode mode;
-  };
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_Parameter;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module Dynamic
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// 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
-// 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
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#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/Empty_Param_TypeCode.cpp b/TAO/tao/Empty_Param_TypeCode.cpp
deleted file mode 100644
index 6f9f5589c15..00000000000
--- a/TAO/tao/Empty_Param_TypeCode.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-// $Id$
-
-#include "Empty_Param_TypeCode.h"
-
-#ifndef __ACE_INLINE__
-# include "Empty_Param_TypeCode.inl"
-#endif  /* !__ACE_INLINE__ */
-
-
-ACE_RCSID (tao,
-           Empty_Param_TypeCode,
-           "$Id$")
-
-
-bool
-TAO::TypeCode::Empty_Param::tao_marshal (TAO_OutputCDR &,
-                                         CORBA::ULong) const
-{
-  // Empty parameter list.  Nothing to marshal.
-
-  return true;
-}
-
-void
-TAO::TypeCode::Empty_Param::tao_duplicate (void)
-{
-  // No-op since empty parameter TypeCodes are never created
-  // dynamically, meaning there is no need to implement reference
-  // counting.
-}
-
-void
-TAO::TypeCode::Empty_Param::tao_release (void)
-{
-  // No-op since empty parameter TypeCodes are never created
-  // dynamically, meaning there is no need to implement reference
-  // counting.
-}
-
-CORBA::Boolean
-TAO::TypeCode::Empty_Param::equal_i (CORBA::TypeCode_ptr
-                                     ACE_ENV_ARG_DECL_NOT_USED) const
-{
-  // Equality has already been established in the
-  // CORBA::TypeCode base class.
-
-  return 1;
-}
-
-CORBA::Boolean
-TAO::TypeCode::Empty_Param::equivalent_i (CORBA::TypeCode_ptr tc
-                                          ACE_ENV_ARG_DECL) const
-{
-  // We could refactor this code to the CORBA::TypeCode::equivalent()
-  // method but doing so would force us to determine the unaliased
-  // kind of this TypeCode.  Since we already know the unaliased kind
-  // of this TypeCode, choose to optimize away the additional kind
-  // unaliasing operation rather than save space.
-
-  CORBA::TCKind const tc_kind =
-    TAO::unaliased_kind (tc
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (tc_kind != this->kind_)
-    return 0;
-
-  return 1;
-}
-
-CORBA::TypeCode_ptr
-TAO::TypeCode::Empty_Param::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Already compact since parameter list is empty.
-
-  // Since empty parameter TypeCodes are never created
-  // dynamically, there is no need to manipulate a reference count.
-
-  static TAO::TypeCode::Empty_Param compact_typecode (this->kind_);
-
-  return &compact_typecode;
-}
diff --git a/TAO/tao/Empty_Param_TypeCode.h b/TAO/tao/Empty_Param_TypeCode.h
deleted file mode 100644
index a45f9bea94a..00000000000
--- a/TAO/tao/Empty_Param_TypeCode.h
+++ /dev/null
@@ -1,98 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Empty_Param_TypeCode.h
- *
- *  $Id$
- *
- *  Header file for @c CORBA::TypeCodes with empty parameter lists.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_EMPTY_PARAM_TYPECODE_H
-#define TAO_EMPTY_PARAM_TYPECODE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TypeCode.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-
-    /**
-     * @class Empty_Param
-     *
-     * @brief @c CORBA::TypeCode implementation for OMG IDL types with
-     *        empty parameter lists.
-     *
-     * This class implements a @c CORBA::TypeCode for OMG IDL types
-     * with empty parameter lists.
-     *
-     * @note @c Empty_Param @c TypeCodes are not reference counted in
-     *       TAO since they are static, exist as constants for the
-     *       length of a given OS process, and cannot be created
-     *       through the @c CORBA::ORB or @c CORBA::TypeCodeFactory
-     *       interfaces.
-     */
-    class Empty_Param : public CORBA::TypeCode
-    {
-    public:
-
-      /// Constructor.
-      Empty_Param (CORBA::TCKind k);
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
-      //@}
-
-    protected:
-
-      /**
-       * @name @c TAO CORBA::TypeCode Template Methods
-       *
-       * @c CORBA::TypeCode template methods specific to @c TypeCodes
-       * with empty parameter lists.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/Empty_Param_TypeCode.inl"
-#endif  /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_EMPTY_PARAM_TYPECODE_H */
diff --git a/TAO/tao/Empty_Param_TypeCode.inl b/TAO/tao/Empty_Param_TypeCode.inl
deleted file mode 100644
index 85ec45fd029..00000000000
--- a/TAO/tao/Empty_Param_TypeCode.inl
+++ /dev/null
@@ -1,10 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-
-ACE_INLINE
-TAO::TypeCode::Empty_Param::Empty_Param (CORBA::TCKind k)
-  : CORBA::TypeCode (k)
-{
-}
diff --git a/TAO/tao/Enum_TypeCode.cpp b/TAO/tao/Enum_TypeCode.cpp
deleted file mode 100644
index d7c3cd7d92a..00000000000
--- a/TAO/tao/Enum_TypeCode.cpp
+++ /dev/null
@@ -1,221 +0,0 @@
-// $Id$
-
-#ifndef TAO_ENUM_TYPECODE_CPP
-#define TAO_ENUM_TYPECODE_CPP
-
-#include "tao/Enum_TypeCode.h"
-#include "tao/TypeCode_Traits.h"
-#include "tao/TypeCodeFactory_Adapter.h"
-#include "tao/ORB_Core.h"
-#include "tao/CDR.h"
-
-#include "ace/Dynamic_Service.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/Enum_TypeCode.inl"
-#endif  /* !__ACE_INLINE__ */
-
-
-template <typename StringType, class EnumeratorArrayType, class RefCountPolicy>
-bool
-TAO::TypeCode::Enum<StringType,
-                    EnumeratorArrayType,
-                    RefCountPolicy>::tao_marshal (TAO_OutputCDR & cdr,
-                                                  CORBA::ULong) const
-{
-  // A tk_enum TypeCode has a "complex" parameter list type (see
-  // Table 15-2 in Section 15.3.5.1 "TypeCode" in the CDR section of
-  // the CORBA specification), meaning that it must be marshaled into
-  // a CDR encapsulation.
-
-  // Create a CDR encapsulation.
-  TAO_OutputCDR enc;
-
-  bool const success =
-    (enc << TAO_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER))
-    && (enc << TAO_OutputCDR::from_string (this->base_attributes_.id (), 0))
-    && (enc << TAO_OutputCDR::from_string (this->base_attributes_.name (), 0))
-    && (enc << this->nenumerators_);
-
-  if (!success)
-    return false;
-
-  StringType const * const begin = &this->enumerators_[0];
-  StringType const * const end   = begin + this->nenumerators_;
-
-  for (StringType const * i = begin; i != end; ++i)
-    {
-      StringType const & enumerator = *i;
-
-      if (!(enc << TAO_OutputCDR::from_string (
-              Traits<StringType>::get_string (enumerator), 0)))
-        return false;
-    }
-
-  return
-    cdr << static_cast<CORBA::ULong> (enc.total_length ())
-    && cdr.write_octet_array_mb (enc.begin ());
-}
-
-template <typename StringType, class EnumeratorArrayType, class RefCountPolicy>
-void
-TAO::TypeCode::Enum<StringType,
-                    EnumeratorArrayType,
-                    RefCountPolicy>::tao_duplicate (void)
-{
-  this->RefCountPolicy::add_ref ();
-}
-
-template <typename StringType, class EnumeratorArrayType, class RefCountPolicy>
-void
-TAO::TypeCode::Enum<StringType,
-                    EnumeratorArrayType,
-                    RefCountPolicy>::tao_release (void)
-{
-  this->RefCountPolicy::remove_ref ();
-}
-
-template <typename StringType, class EnumeratorArrayType, class RefCountPolicy>
-CORBA::Boolean
-TAO::TypeCode::Enum<StringType,
-                    EnumeratorArrayType,
-                    RefCountPolicy>::equal_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // This call shouldn't throw since CORBA::TypeCode::equal() verified
-  // that the TCKind is the same as our's prior to invoking this
-  // method, meaning that member_count() is supported.
-
-  CORBA::ULong const tc_nenumerators =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (tc_nenumerators != this->nenumerators_)
-    return 0;
-
-  for (CORBA::ULong i = 0; i < this->nenumerators_; ++i)
-    {
-      StringType const & lhs_enumerator = this->enumerators_[i];
-
-      char const * const lhs_name =
-        Traits<StringType>::get_string (lhs_enumerator);
-      char const * const rhs_name = tc->member_name (i
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (ACE_OS::strcmp (lhs_name, rhs_name) != 0)
-        return 0;
-    }
-
-  return 1;
-}
-
-template <typename StringType, class EnumeratorArrayType, class RefCountPolicy>
-CORBA::Boolean
-TAO::TypeCode::Enum<StringType,
-                    EnumeratorArrayType,
-                    RefCountPolicy>::equivalent_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // Perform a structural comparison, excluding the name() and
-  // member_name() operations.
-
-  CORBA::ULong const tc_nenumerators =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (tc_nenumerators != this->nenumerators_)
-    return 0;
-
-  return 1;
-}
-
-template <typename StringType, class EnumeratorArrayType, class RefCountPolicy>
-CORBA::TypeCode_ptr
-TAO::TypeCode::Enum<StringType,
-                    EnumeratorArrayType,
-                    RefCountPolicy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
-{
-  ACE_Array_Base<CORBA::String_var> tc_enumerators (this->nenumerators_);
-
-  // Dynamically construct a new array of enumerators stripped of
-  // member names.
-
-  static char const empty_name[] = "";
-
-  for (CORBA::ULong i = 0; i < this->nenumerators_; ++i)
-    {
-      // Member names will be stripped, i.e. not embedded within
-      // the compact TypeCode.
-
-      tc_enumerators[i] = empty_name;
-    }
-
-  TAO_TypeCodeFactory_Adapter * adapter =
-    ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-      TAO_ORB_Core::typecodefactory_adapter_name ());
-
-  if (adapter == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        CORBA::TypeCode::_nil ());
-    }
-
-  return
-    adapter->create_enum_tc (this->base_attributes_.id (),
-                             ""  /* empty name */,
-                             tc_enumerators,
-                             this->nenumerators_
-                             ACE_ENV_ARG_PARAMETER);
-}
-
-template <typename StringType, class EnumeratorArrayType, class RefCountPolicy>
-char const *
-TAO::TypeCode::Enum<StringType, EnumeratorArrayType, RefCountPolicy>::id_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->base_attributes_.id ();
-}
-
-template <typename StringType, class EnumeratorArrayType, class RefCountPolicy>
-char const *
-TAO::TypeCode::Enum<StringType, EnumeratorArrayType, RefCountPolicy>::name_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->base_attributes_.name ();
-}
-
-template <typename StringType, class EnumeratorArrayType, class RefCountPolicy>
-CORBA::ULong
-TAO::TypeCode::Enum<StringType,
-                    EnumeratorArrayType,
-                    RefCountPolicy>::member_count_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->nenumerators_;
-}
-
-template <typename StringType, class EnumeratorArrayType, class RefCountPolicy>
-char const *
-TAO::TypeCode::Enum<StringType,
-                    EnumeratorArrayType,
-                    RefCountPolicy>::member_name_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  if (index >= this->nenumerators_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
-
-  return Traits<StringType>::get_string (this->enumerators_[index]);
-}
-
-#endif  /* TAO_ENUM_TYPECODE_CPP */
diff --git a/TAO/tao/Enum_TypeCode.h b/TAO/tao/Enum_TypeCode.h
deleted file mode 100644
index 3a4b30076bc..00000000000
--- a/TAO/tao/Enum_TypeCode.h
+++ /dev/null
@@ -1,141 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Enum_TypeCode.h
- *
- *  $Id$
- *
- *  Header file for a @c tk_enum CORBA::TypeCode.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_ENUM_TYPECODE_H
-#define TAO_ENUM_TYPECODE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TypeCode.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TypeCode_Base_Attributes.h"
-
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    /**
-     * @class Enum
-     *
-     * @brief @c CORBA::TypeCode implementation for an OMG IDL
-     *        @c enum.
-     *
-     * This class implements a @c CORBA::TypeCode for an OMG IDL
-     * @c enum.
-     */
-    template <typename StringType,
-              class EnumeratorArrayType,
-              class RefCountPolicy>
-    class Enum
-      : public CORBA::TypeCode,
-        private RefCountPolicy
-    {
-    public:
-
-      /// Constructor.
-      Enum (char const * id,
-            char const * name,
-            EnumeratorArrayType const & enumerators,
-            CORBA::ULong nenumerators);
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
-      //@}
-
-    protected:
-
-      /**
-       * @name @c TAO CORBA::TypeCode Template Methods
-       *
-       * @c tk_enum @c CORBA::TypeCode -specific template methods.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * member_name_i (CORBA::ULong index
-                                          ACE_ENV_ARG_DECL) const;
-      //@}
-
-    private:
-
-      /**
-       * @c Enum Attributes
-       *
-       * Attributes representing the structure of an OMG IDL
-       * @c enum.
-       *
-       * @note These attributes are declared in the order in which
-       *       they are marshaled into a CDR stream in order to
-       *       increase cache hits by improving spatial locality.
-       */
-      //@{
-
-      /// Base attributes containing repository ID and name of
-      /// structure type.
-      Base_Attributes<StringType> base_attributes_;
-
-      /// The number of enumerators in the OMG IDL enumeration.
-      CORBA::ULong const nenumerators_;
-
-      /// Array of @c TAO::TypeCode enumerators representing
-      /// enumerators in the OMG IDL defined @c enum.
-      EnumeratorArrayType const enumerators_;
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/Enum_TypeCode.inl"
-#endif  /* __ACE_INLINE__ */
-
-#ifdef ACE_TEMPLATES_REQUIRE_SOURCE
-# include "tao/Enum_TypeCode.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
-# pragma implementation ("Enum_TypeCode.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ENUM_TYPECODE_H */
diff --git a/TAO/tao/Enum_TypeCode.inl b/TAO/tao/Enum_TypeCode.inl
deleted file mode 100644
index 8b8e04f8632..00000000000
--- a/TAO/tao/Enum_TypeCode.inl
+++ /dev/null
@@ -1,21 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-
-template <typename StringType,
-          class EnumeratorArrayType,
-          class RefCountPolicy>
-ACE_INLINE
-TAO::TypeCode::Enum<StringType, EnumeratorArrayType, RefCountPolicy>::Enum (
-  char const * id,
-  char const * name,
-  EnumeratorArrayType const & enumerators,
-  CORBA::ULong nenumerators)
-  : CORBA::TypeCode (CORBA::tk_enum)
-  , RefCountPolicy ()
-  , base_attributes_ (id, name)
-  , nenumerators_ (nenumerators)
-  , enumerators_ (enumerators)
-{
-}
diff --git a/TAO/tao/Enum_TypeCode_Static.cpp b/TAO/tao/Enum_TypeCode_Static.cpp
deleted file mode 100644
index adda05c5985..00000000000
--- a/TAO/tao/Enum_TypeCode_Static.cpp
+++ /dev/null
@@ -1,214 +0,0 @@
-// $Id$
-
-#include "tao/Enum_TypeCode_Static.h"
-#include "tao/TypeCode_Traits.h"
-#include "tao/TypeCodeFactory_Adapter.h"
-#include "tao/ORB_Core.h"
-#include "tao/CDR.h"
-
-#include "ace/Dynamic_Service.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/Enum_TypeCode_Static.inl"
-#endif  /* !__ACE_INLINE__ */
-
-
-ACE_RCSID (tao,
-           Enum_TypeCode_Static,
-           "$Id$")
-
-
-bool
-TAO::TypeCode::Enum<char const *,
-                    char const * const *,
-                    TAO::Null_RefCount_Policy>::tao_marshal (
-  TAO_OutputCDR & cdr,
-  CORBA::ULong) const
-{
-  // A tk_enum TypeCode has a "complex" parameter list type (see
-  // Table 15-2 in Section 15.3.5.1 "TypeCode" in the CDR section of
-  // the CORBA specification), meaning that it must be marshaled into
-  // a CDR encapsulation.
-
-  // Create a CDR encapsulation.
-  TAO_OutputCDR enc;
-
-  bool const success =
-    (enc << TAO_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER))
-    && (enc << TAO_OutputCDR::from_string (this->base_attributes_.id (), 0))
-    && (enc << TAO_OutputCDR::from_string (this->base_attributes_.name (), 0))
-    && (enc << this->nenumerators_);
-
-  if (!success)
-    return false;
-
-  char const * const * const begin = &this->enumerators_[0];
-  char const * const * const end   = begin + this->nenumerators_;
-
-  for (char const * const * i = begin; i != end; ++i)
-    {
-      char const * const & enumerator = *i;
-
-      if (!(enc << TAO_OutputCDR::from_string (
-              Traits<char const *>::get_string (enumerator), 0)))
-        return false;
-    }
-
-  return
-    cdr << static_cast<CORBA::ULong> (enc.total_length ())
-    && cdr.write_octet_array_mb (enc.begin ());
-}
-
-void
-TAO::TypeCode::Enum<char const *,
-                    char const * const *,
-                    TAO::Null_RefCount_Policy>::tao_duplicate (void)
-{
-}
-
-void
-TAO::TypeCode::Enum<char const *,
-                    char const * const *,
-                    TAO::Null_RefCount_Policy>::tao_release (void)
-{
-}
-
-CORBA::Boolean
-TAO::TypeCode::Enum<char const *,
-                    char const * const *,
-                    TAO::Null_RefCount_Policy>::equal_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // This call shouldn't throw since CORBA::TypeCode::equal() verified
-  // that the TCKind is the same as our's prior to invoking this
-  // method, meaning that member_count() is supported.
-
-  CORBA::ULong const tc_nenumerators =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (tc_nenumerators != this->nenumerators_)
-    return 0;
-
-  for (CORBA::ULong i = 0; i < this->nenumerators_; ++i)
-    {
-      char const * const & lhs_enumerator = this->enumerators_[i];
-
-      char const * const lhs_name =
-        Traits<char const *>::get_string (lhs_enumerator);
-      char const * const rhs_name = tc->member_name (i
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (ACE_OS::strcmp (lhs_name, rhs_name) != 0)
-        return 0;
-    }
-
-  return 1;
-}
-
-CORBA::Boolean
-TAO::TypeCode::Enum<char const *,
-                    char const * const *,
-                    TAO::Null_RefCount_Policy>::equivalent_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // Perform a structural comparison, excluding the name() and
-  // member_name() operations.
-
-  CORBA::ULong const tc_nenumerators =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (tc_nenumerators != this->nenumerators_)
-    return 0;
-
-  return 1;
-}
-
-CORBA::TypeCode_ptr
-TAO::TypeCode::Enum<char const *,
-                    char const * const *,
-                    TAO::Null_RefCount_Policy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
-{
-  ACE_Array_Base<CORBA::String_var> tc_enumerators (this->nenumerators_);
-
-  // Dynamically construct a new array of enumerators stripped of
-  // member names.
-
-  static char const empty_name[] = "";
-
-  for (CORBA::ULong i = 0; i < this->nenumerators_; ++i)
-    {
-      // Member names will be stripped, i.e. not embedded within
-      // the compact TypeCode.
-
-      tc_enumerators[i] = empty_name;
-    }
-
-  TAO_TypeCodeFactory_Adapter * adapter =
-    ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-      TAO_ORB_Core::typecodefactory_adapter_name ());
-
-  if (adapter == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        CORBA::TypeCode::_nil ());
-    }
-
-  return
-    adapter->create_enum_tc (this->base_attributes_.id (),
-                             ""  /* empty name */,
-                             tc_enumerators,
-                             this->nenumerators_
-                             ACE_ENV_ARG_PARAMETER);
-}
-
-char const *
-TAO::TypeCode::Enum<char const *,
-                    char const * const *,
-                    TAO::Null_RefCount_Policy>::id_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->base_attributes_.id ();
-}
-
-char const *
-TAO::TypeCode::Enum<char const *,
-                    char const * const *,
-                    TAO::Null_RefCount_Policy>::name_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->base_attributes_.name ();
-}
-
-CORBA::ULong
-TAO::TypeCode::Enum<char const *,
-                    char const * const *,
-                    TAO::Null_RefCount_Policy>::member_count_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->nenumerators_;
-}
-
-char const *
-TAO::TypeCode::Enum<char const *,
-                    char const * const *,
-                    TAO::Null_RefCount_Policy>::member_name_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  if (index >= this->nenumerators_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
-
-  return Traits<char const *>::get_string (this->enumerators_[index]);
-}
diff --git a/TAO/tao/Enum_TypeCode_Static.h b/TAO/tao/Enum_TypeCode_Static.h
deleted file mode 100644
index fd1bf6f579a..00000000000
--- a/TAO/tao/Enum_TypeCode_Static.h
+++ /dev/null
@@ -1,137 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Enum_TypeCode_Static.h
- *
- *  $Id$
- *
- *  Header file for a static @c tk_enum CORBA::TypeCode.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_ENUM_TYPECODE_STATIC_H
-#define TAO_ENUM_TYPECODE_STATIC_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TypeCode.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TypeCode_Base_Attributes.h"
-#include "tao/Null_RefCount_Policy.h"
-
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    template <typename StringType,
-              class EnumeratorArrayType,
-              class RefCountPolicy> class Enum;
-
-    /**
-     * @class Enum
-     *
-     * @brief @c CORBA::TypeCode implementation for an OMG IDL
-     *        @c enum.
-     *
-     * This class implements a @c CORBA::TypeCode for an OMG IDL
-     * @c enum.
-     */
-    template<>
-    class TAO_Export Enum<char const *,
-                          char const * const *,
-                          TAO::Null_RefCount_Policy>
-      : public CORBA::TypeCode,
-        private TAO::Null_RefCount_Policy
-    {
-    public:
-
-      /// Constructor.
-      Enum (char const * id,
-            char const * name,
-            char const * const * enumerators,
-            CORBA::ULong nenumerators);
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
-      //@}
-
-    protected:
-
-      /**
-       * @name @c TAO CORBA::TypeCode Template Methods
-       *
-       * @c tk_enum @c CORBA::TypeCode -specific template methods.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * member_name_i (CORBA::ULong index
-                                          ACE_ENV_ARG_DECL) const;
-      //@}
-
-    private:
-
-      /**
-       * @c Enum Attributes
-       *
-       * Attributes representing the structure of an OMG IDL
-       * @c enum.
-       *
-       * @note These attributes are declared in the order in which
-       *       they are marshaled into a CDR stream in order to
-       *       increase cache hits by improving spatial locality.
-       */
-      //@{
-
-      /// Base attributes containing repository ID and name of
-      /// structure type.
-      Base_Attributes<char const *> base_attributes_;
-
-      /// The number of enumerators in the OMG IDL enumeration.
-      CORBA::ULong const nenumerators_;
-
-      /// Array of @c TAO::TypeCode enumerators representing
-      /// enumerators in the OMG IDL defined @c enum.
-      char const * const * const enumerators_;
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/Enum_TypeCode_Static.inl"
-#endif  /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ENUM_TYPECODE_STATIC_H */
diff --git a/TAO/tao/Enum_TypeCode_Static.inl b/TAO/tao/Enum_TypeCode_Static.inl
deleted file mode 100644
index 1d2ab5ca8cb..00000000000
--- a/TAO/tao/Enum_TypeCode_Static.inl
+++ /dev/null
@@ -1,20 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-
-ACE_INLINE
-TAO::TypeCode::Enum<char const *,
-                    char const * const *,
-                    TAO::Null_RefCount_Policy>::Enum (
-  char const * id,
-  char const * name,
-  char const * const * enumerators,
-  CORBA::ULong nenumerators)
-  : CORBA::TypeCode (CORBA::tk_enum)
-  , ACE_NESTED_CLASS (TAO, Null_RefCount_Policy) ()
-  , base_attributes_ (id, name)
-  , nenumerators_ (nenumerators)
-  , enumerators_ (enumerators)
-{
-}
diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp
index 1f88e3ff36d..04fb03d6ca8 100644
--- a/TAO/tao/Exception.cpp
+++ b/TAO/tao/Exception.cpp
@@ -3,11 +3,7 @@
 #include "Exception.h"
 #include "SystemException.h"
 #include "Environment.h"
-#include "Any_SystemException.h"
-#include "Any_Dual_Impl_T.h"
-#include "TypeCode.h"
 #include "ORB_Constants.h"
-#include "TypeCode_Constants.h"
 #include "CORBA_String.h"
 #include "CDR.h"
 #include "debug.h"
@@ -90,21 +86,6 @@ CORBA::Exception::_name (void) const
   return this->name_.in ();
 }
 
-CORBA::TypeCode_ptr
-CORBA::Exception::_tao_type (void) const
-{
-  return CORBA::TypeCode::_nil ();
-}
-
-int
-CORBA::Exception::_is_a (const char* repository_id) const
-{
-  return ACE_OS::strcmp (repository_id,
-                         "IDL:omg.org/CORBA/Exception:1.0") == 0;
-}
-
-
-
 void
 CORBA::Exception::_tao_print_exception (const char *user_provided_info,
                                         FILE *) const
@@ -158,113 +139,3 @@ namespace CORBA
 
 #endif /* (ACE_LACKS_IOSTREAM_TOTALLY) */
 
-
-#if defined (TAO_DONT_CATCH_DOT_DOT_DOT)
-TAO_DONT_CATCH::TAO_DONT_CATCH (void)
-{}
-#endif /* TAO_DONT_CATCH_DOT_DOT_DOT */
-
-// Specializations for CORBA::Exception Any operators.
-namespace TAO
-{
-  template<>
-  void
-  Any_Dual_Impl_T<CORBA::Exception>::value (
-      const CORBA::Exception & val
-    )
-  {
-    this->value_ = val._tao_duplicate ();
-  }
-
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<CORBA::Exception>::marshal_value (TAO_OutputCDR &cdr)
-  {
-    ACE_TRY_NEW_ENV
-      {
-        this->value_->_tao_encode (cdr
-                                   ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        return 1;
-      }
-    ACE_CATCHANY
-      {
-      }
-    ACE_ENDTRY;
-
-    return 0;
-  }
-
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<CORBA::Exception>::demarshal_value (TAO_InputCDR &cdr)
-  {
-    ACE_TRY_NEW_ENV
-      {
-        this->value_->_tao_decode (cdr
-                                   ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        return 1;
-      }
-    ACE_CATCHANY
-      {
-      }
-    ACE_ENDTRY;
-
-    return 0;
-  }
-
-  // This should never get called since we don't have extraction operators
-  // for CORBA::Exception, but it is here to sidestep the constructor call
-  // in the unspecialized version that causes a problem with compilers that
-  // require explicit instantiation
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<CORBA::Exception>::extract (
-      const CORBA::Any &,
-      _tao_destructor,
-      CORBA::TypeCode_ptr,
-      const CORBA::Exception *&
-    )
-  {
-    return 0;
-  }
-}
-
-// =======================================================================
-
-// Insertion of CORBA::Exception - copying.
-void
-operator<<= (CORBA::Any &any, const CORBA::Exception &exception)
-{
-  TAO::Any_Dual_Impl_T<CORBA::Exception>::insert_copy (
-      any,
-      CORBA::Exception::_tao_any_destructor,
-      exception._tao_type (),
-      exception
-    );
-}
-
-// Insertion of CORBA::Exception - non-copying.
-void
-operator<<= (CORBA::Any &any, CORBA::Exception *exception)
-{
-  TAO::Any_Dual_Impl_T<CORBA::Exception>::insert (
-      any,
-      CORBA::Exception::_tao_any_destructor,
-      exception->_tao_type (),
-      exception
-    );
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class TAO::Any_Dual_Impl_T<CORBA::Exception>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate TAO::Any_Dual_Impl_T<CORBA::Exception>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h
index b25c539335d..3eba5fe9a48 100644
--- a/TAO/tao/Exception.h
+++ b/TAO/tao/Exception.h
@@ -136,10 +136,7 @@ namespace CORBA
     // = These are TAO-specific extensions.
 
     /// Will be overridden in the concrete derived classes.
-    virtual CORBA::TypeCode_ptr _tao_type (void) const;
-
-    // = To implement the narrow method.
-    virtual int _is_a (const char* repository_id) const;
+    virtual CORBA::TypeCode_ptr _tao_type (void) const = 0;
 
     /// Print the exception to output determined by @a f.
     /**
@@ -150,6 +147,9 @@ namespace CORBA
 
 #if defined (ACE_USES_WCHAR)
     /// ACE_WCHAR_T version of _tao_print_exception.
+    /**
+     * @note This method is TAO-specific.
+     */
     void _tao_print_exception (const ACE_WCHAR_T *info,
                                FILE *f = stdout) const;
 #endif  // ACE_USES_WCHAR
@@ -159,9 +159,10 @@ namespace CORBA
     virtual ACE_CString _info (void) const = 0;
 
     virtual void _tao_encode (TAO_OutputCDR &cdr
-                              ACE_ENV_ARG_DECL_NOT_USED) const = 0;
+                              ACE_ENV_ARG_DECL) const = 0;
+
     virtual void _tao_decode (TAO_InputCDR &cdr
-                              ACE_ENV_ARG_DECL_NOT_USED) = 0;
+                              ACE_ENV_ARG_DECL) = 0;
 
     /// Used in the non-copying Any insertion operator.
     static void _tao_any_destructor (void *);
@@ -178,7 +179,13 @@ namespace CORBA
      * public:
      *   virtual CORBA::Exception *_tao_duplicate (void) const
      *   {
-     *     return new SomeException (*this);
+     *     CORBA::Exception *result = 0;
+     *     ACE_NEW_RETURN (
+     *         result,
+     *         SomeException (*this),
+     *         0
+     *       );
+     *     return result;
      *   }
      * };
      * </PRE>
@@ -223,32 +230,9 @@ class TAO_Export TAO_Exceptions
 public:
 
   /// Create a CORBA::SystemException given the interface repository ID.
-  static CORBA::SystemException *create_system_exception (
-      const char *id
-      ACE_ENV_ARG_DECL
-    );
-
+  static CORBA::SystemException *create_system_exception (const char *id);
 };
 
-#if defined (TAO_DONT_CATCH_DOT_DOT_DOT)
-/**
- * @class TAO_DONT_CATCH
- *
- * @brief This class is only used internally in TAO as an exception
- * that never gets thrown.  Never use this class anywhere.
- *
- * @internal
- */
-class TAO_Export TAO_DONT_CATCH
-{
-public:
-  TAO_DONT_CATCH (void);
-};
-#endif /* TAO_DONT_CATCH_DOT_DOT_DOT */
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::Exception &);
-TAO_Export void operator<<= (CORBA::Any &, CORBA::Exception *);
-
 #if defined (__ACE_INLINE__)
 # include "tao/Exception.i"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Fixed_Array_Argument_T.cpp b/TAO/tao/Fixed_Array_Argument_T.cpp
index 4d02a03d3bf..022a61356eb 100644
--- a/TAO/tao/Fixed_Array_Argument_T.cpp
+++ b/TAO/tao/Fixed_Array_Argument_T.cpp
@@ -4,7 +4,6 @@
 #define TAO_FIXED_ARRAY_ARGUMENT_T_C
 
 #include "tao/Fixed_Array_Argument_T.h"
-#include "tao/Dynamic_ParameterC.h"
 
 #if !defined (__ACE_INLINE__)
 #include "tao/Fixed_Array_Argument_T.inl"
@@ -14,9 +13,12 @@ ACE_RCSID (tao,
            Fixed_Array_Argument_T,
            "$Id$")
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::In_Fixed_Array_Argument_T<S,S_slice,S_forany>::marshal (
+TAO::In_Fixed_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::marshal (
     TAO_OutputCDR & cdr
   )
 {
@@ -25,32 +27,39 @@ TAO::In_Fixed_Array_Argument_T<S,S_slice,S_forany>::marshal (
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 void
-TAO::In_Fixed_Array_Argument_T<S,S_slice,S_forany>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::In_Fixed_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_IN;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ===========================================================
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_Fixed_Array_Argument_T<S,S_slice,S_forany>::marshal (
+TAO::Inout_Fixed_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::marshal (
     TAO_OutputCDR & cdr
   )
 {
   return cdr << this->x_;
 }
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_Fixed_Array_Argument_T<S,S_slice,S_forany>::demarshal (
+TAO::Inout_Fixed_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::demarshal (
     TAO_InputCDR & cdr
   )
 {
@@ -59,23 +68,27 @@ TAO::Inout_Fixed_Array_Argument_T<S,S_slice,S_forany>::demarshal (
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 void
-TAO::Inout_Fixed_Array_Argument_T<S,S_slice,S_forany>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::Inout_Fixed_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_INOUT;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ==============================================================
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Out_Fixed_Array_Argument_T<S,S_slice,S_forany>::demarshal (
+TAO::Out_Fixed_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::demarshal (
     TAO_InputCDR & cdr
   )
 {
@@ -84,14 +97,15 @@ TAO::Out_Fixed_Array_Argument_T<S,S_slice,S_forany>::demarshal (
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 void
-TAO::Out_Fixed_Array_Argument_T<S,S_slice,S_forany>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::Out_Fixed_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_OUT;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -102,9 +116,10 @@ template<typename S,
          typename S_slice,
          typename S_var,
          typename S_forany,
-         typename S_tag>
+         typename S_tag,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Ret_Fixed_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::demarshal (
+TAO::Ret_Fixed_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag,Insert_Policy>::demarshal (
     TAO_InputCDR & cdr
   )
 {
@@ -124,12 +139,13 @@ template<typename S,
          typename S_slice,
          typename S_var,
          typename S_forany,
-         typename S_tag>
+         typename S_tag,
+         typename Insert_Policy>
 void
-TAO::Ret_Fixed_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::
-interceptor_result (CORBA::Any * any)
+TAO::Ret_Fixed_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag,Insert_Policy>::
+interceptor_value (CORBA::Any *any) const
 {
-  (*any) <<= S_forany (this->x_.ptr ());
+  this->Insert_Policy::any_insert (any, S_forany (this->x_.ptr ()));
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
diff --git a/TAO/tao/Fixed_Array_Argument_T.h b/TAO/tao/Fixed_Array_Argument_T.h
index bf3522022e5..2ff2f43976b 100644
--- a/TAO/tao/Fixed_Array_Argument_T.h
+++ b/TAO/tao/Fixed_Array_Argument_T.h
@@ -29,15 +29,18 @@ namespace TAO
    * @brief IN stub argument of fixed size element array.
    *
    */
-  template<typename S, typename S_slice, typename S_forany>
-  class In_Fixed_Array_Argument_T : public Argument
+  template<typename S,
+           typename S_slice,
+           typename S_forany,
+           typename Insert_Policy>
+  class In_Fixed_Array_Argument_T : public InArgument, private Insert_Policy
   {
   public:
     In_Fixed_Array_Argument_T (const S_slice * x);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S_slice const * arg (void) const;
 
@@ -51,16 +54,19 @@ namespace TAO
    * @brief INOUT stub argument of fixed size element array.
    *
    */
-  template<typename S, typename S_slice, typename S_forany>
-  class Inout_Fixed_Array_Argument_T : public Argument
+  template<typename S,
+           typename S_slice,
+           typename S_forany,
+           typename Insert_Policy>
+  class Inout_Fixed_Array_Argument_T : public InoutArgument, private Insert_Policy
   {
   public:
     Inout_Fixed_Array_Argument_T (S_slice *&x);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S_slice * arg (void);
 
@@ -74,15 +80,18 @@ namespace TAO
    * @brief OUT stub argument of fixed size element array.
    *
    */
-  template<typename S, typename S_slice, typename S_forany>
-  class Out_Fixed_Array_Argument_T : public Argument
+  template<typename S,
+           typename S_slice,
+           typename S_forany,
+           typename Insert_Policy>
+  class Out_Fixed_Array_Argument_T : public OutArgument, private Insert_Policy
   {
   public:
     Out_Fixed_Array_Argument_T (S_slice *& x);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S_slice *& arg (void);
 
@@ -100,15 +109,16 @@ namespace TAO
            typename S_slice,
            typename S_var,
            typename S_forany,
-           typename S_tag>
-  class Ret_Fixed_Array_Argument_T : public Argument
+           typename S_tag,
+           typename Insert_Policy>
+  class Ret_Fixed_Array_Argument_T : public RetArgument, private Insert_Policy
   {
   public:
     Ret_Fixed_Array_Argument_T (void);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_result (CORBA::Any *);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S_slice *& arg (void);
 
@@ -137,7 +147,8 @@ namespace TAO
            typename T_slice,
            typename T_var,
            typename T_forany,
-           typename T_tag>
+           typename T_tag,
+           typename Insert_Policy>
   struct Fixed_Array_Arg_Traits_T
   {
     typedef T_slice *                                   ret_type;
@@ -147,20 +158,24 @@ namespace TAO
 
     typedef In_Fixed_Array_Argument_T<T,
                                       T_slice,
-                                      T_forany>         in_arg_val;
+                                      T_forany,
+                                      Insert_Policy>         in_arg_val;
     typedef Inout_Fixed_Array_Argument_T<T,
                                          T_slice,
-                                         T_forany>      inout_arg_val;
+                                         T_forany,
+                                         Insert_Policy>      inout_arg_val;
     typedef Out_Fixed_Array_Argument_T<T,
                                        T_slice,
-                                       T_forany>        out_arg_val;
+                                       T_forany,
+                                       Insert_Policy>        out_arg_val;
     typedef Ret_Fixed_Array_Argument_T<T,
                                        T_slice,
                                        T_var,
                                        T_forany,
-                                       T_tag>           ret_val;
+                                       T_tag,
+                                       Insert_Policy>        ret_val;
 
-    typedef Fixed_Array_Tag                             idl_tag;
+    typedef Fixed_Array_Tag                                  idl_tag;
   };
 }
 
diff --git a/TAO/tao/Fixed_Array_Argument_T.inl b/TAO/tao/Fixed_Array_Argument_T.inl
index 0df9d5cee7d..de891a44bcd 100644
--- a/TAO/tao/Fixed_Array_Argument_T.inl
+++ b/TAO/tao/Fixed_Array_Argument_T.inl
@@ -4,9 +4,10 @@
 
 template<typename S,
          typename S_slice,
-         typename S_forany>
+         typename S_forany,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::In_Fixed_Array_Argument_T<S,S_slice,S_forany>::
+TAO::In_Fixed_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::
 In_Fixed_Array_Argument_T (const S_slice * x)
   : x_ (
 #if (defined (_MSC_VER) && _MSC_VER <= 1200) || (defined (__IBMCPP__) && (__IBMCPP__ <= 600))
@@ -26,10 +27,11 @@ In_Fixed_Array_Argument_T (const S_slice * x)
 
 template<typename S,
          typename S_slice,
-         typename S_forany>
+         typename S_forany,
+         typename Insert_Policy>
 ACE_INLINE
 const S_slice *
-TAO::In_Fixed_Array_Argument_T<S,S_slice,S_forany>::arg (void) const
+TAO::In_Fixed_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::arg (void) const
 {
   return this->x_.in ();
 }
@@ -38,19 +40,21 @@ TAO::In_Fixed_Array_Argument_T<S,S_slice,S_forany>::arg (void) const
 
 template<typename S,
          typename S_slice,
-         typename S_forany>
+         typename S_forany,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Inout_Fixed_Array_Argument_T<S,S_slice,S_forany>::
+TAO::Inout_Fixed_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::
 Inout_Fixed_Array_Argument_T (S_slice *& x)
   : x_ (x)
 {}
 
 template<typename S,
          typename S_slice,
-         typename S_forany>
+         typename S_forany,
+         typename Insert_Policy>
 ACE_INLINE
 S_slice *
-TAO::Inout_Fixed_Array_Argument_T<S,S_slice,S_forany>::arg (void)
+TAO::Inout_Fixed_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::arg (void)
 {
   return this->x_.inout ();
 }
@@ -59,18 +63,20 @@ TAO::Inout_Fixed_Array_Argument_T<S,S_slice,S_forany>::arg (void)
 
 template<typename S,
          typename S_slice,
-         typename S_forany>
+         typename S_forany,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Out_Fixed_Array_Argument_T<S,S_slice,S_forany>::Out_Fixed_Array_Argument_T (S_slice *&x)
+TAO::Out_Fixed_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::Out_Fixed_Array_Argument_T (S_slice *&x)
   : x_ (x)
 {}
 
 template<typename S,
          typename S_slice,
-         typename S_forany>
+         typename S_forany,
+         typename Insert_Policy>
 ACE_INLINE
 S_slice *&
-TAO::Out_Fixed_Array_Argument_T<S,S_slice,S_forany>::arg (void)
+TAO::Out_Fixed_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::arg (void)
 {
   return this->x_.out ();
 }
@@ -81,9 +87,10 @@ template<typename S,
          typename S_slice,
          typename S_var,
          typename S_forany,
-         typename S_tag>
+         typename S_tag,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Ret_Fixed_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::
+TAO::Ret_Fixed_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag,Insert_Policy>::
 Ret_Fixed_Array_Argument_T (void)
 {}
 
@@ -91,10 +98,11 @@ template<typename S,
          typename S_slice,
          typename S_var,
          typename S_forany,
-         typename S_tag>
+         typename S_tag,
+         typename Insert_Policy>
 ACE_INLINE
 S_slice *&
-TAO::Ret_Fixed_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::arg (void)
+TAO::Ret_Fixed_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag,Insert_Policy>::arg (void)
 {
   return this->x_._retn_arg ();
 }
@@ -103,10 +111,11 @@ template<typename S,
          typename S_slice,
          typename S_var,
          typename S_forany,
-         typename S_tag>
+         typename S_tag,
+         typename Insert_Policy>
 ACE_INLINE
 S_slice *
-TAO::Ret_Fixed_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::excp (void)
+TAO::Ret_Fixed_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag,Insert_Policy>::excp (void)
 {
   return this->x_.ptr ();
 }
@@ -115,10 +124,11 @@ template<typename S,
          typename S_slice,
          typename S_var,
          typename S_forany,
-         typename S_tag>
+         typename S_tag,
+         typename Insert_Policy>
 ACE_INLINE
 S_slice *
-TAO::Ret_Fixed_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::retn (void)
+TAO::Ret_Fixed_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag,Insert_Policy>::retn (void)
 {
   return this->x_._retn ();
 }
diff --git a/TAO/tao/Fixed_Size_Argument_T.cpp b/TAO/tao/Fixed_Size_Argument_T.cpp
index 0819eabf688..60a2fe74a63 100644
--- a/TAO/tao/Fixed_Size_Argument_T.cpp
+++ b/TAO/tao/Fixed_Size_Argument_T.cpp
@@ -4,7 +4,6 @@
 #define TAO_FIXED_SIZE_ARGUMENT_T_C
 
 #include "tao/Fixed_Size_Argument_T.h"
-#include "tao/Dynamic_ParameterC.h"
 
 #if !defined (__ACE_INLINE__)
 #include "tao/Fixed_Size_Argument_T.inl"
@@ -14,94 +13,97 @@ ACE_RCSID (tao,
            Fixed_Size_Argument_T,
            "$Id$")
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::In_Fixed_Size_Argument_T<S>::marshal (TAO_OutputCDR & cdr)
+TAO::In_Fixed_Size_Argument_T<S,Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << *this->x_;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 void
-TAO::In_Fixed_Size_Argument_T<S>::interceptor_param (Dynamic::Parameter & p)
+TAO::In_Fixed_Size_Argument_T<S,Insert_Policy>::interceptor_value (CORBA::Any *any) const
 {
-  p.argument <<= *this->x_;
-  p.mode = CORBA::PARAM_IN;
+  this->Insert_Policy::any_insert (any, *this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ===========================================================
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_Fixed_Size_Argument_T<S>::marshal (TAO_OutputCDR & cdr)
+TAO::Inout_Fixed_Size_Argument_T<S,Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << *this->x_;
 }
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_Fixed_Size_Argument_T<S>::demarshal (TAO_InputCDR & cdr)
+TAO::Inout_Fixed_Size_Argument_T<S,Insert_Policy>::demarshal (TAO_InputCDR & cdr)
 {
   return cdr >> *this->x_;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 void
-TAO::Inout_Fixed_Size_Argument_T<S>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::Inout_Fixed_Size_Argument_T<S,Insert_Policy>::interceptor_value (CORBA::Any *any) const
 {
-  p.argument <<= *this->x_;
-  p.mode = CORBA::PARAM_INOUT;
+  this->Insert_Policy::any_insert (any, *this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ==============================================================
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Out_Fixed_Size_Argument_T<S>::demarshal (TAO_InputCDR & cdr)
+TAO::Out_Fixed_Size_Argument_T<S,Insert_Policy>::demarshal (TAO_InputCDR & cdr)
 {
   return cdr >> this->x_;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 void
-TAO::Out_Fixed_Size_Argument_T<S>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::Out_Fixed_Size_Argument_T<S,Insert_Policy>::interceptor_value (CORBA::Any *any) const
 {
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_OUT;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ============================================================
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Ret_Fixed_Size_Argument_T<S>::demarshal (TAO_InputCDR & cdr)
+TAO::Ret_Fixed_Size_Argument_T<S,Insert_Policy>::demarshal (TAO_InputCDR & cdr)
 {
   return cdr >> this->x_;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 void
-TAO::Ret_Fixed_Size_Argument_T<S>::interceptor_result (CORBA::Any * any)
+TAO::Ret_Fixed_Size_Argument_T<S,Insert_Policy>::
+interceptor_value (CORBA::Any *any) const
 {
-  (*any) <<= this->x_;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
diff --git a/TAO/tao/Fixed_Size_Argument_T.h b/TAO/tao/Fixed_Size_Argument_T.h
index c71bf4047ba..e4bc7c3aa3b 100644
--- a/TAO/tao/Fixed_Size_Argument_T.h
+++ b/TAO/tao/Fixed_Size_Argument_T.h
@@ -29,15 +29,16 @@ namespace TAO
    * @brief Template class for IN stub argument of fixed size IDL types.
    *
    */
-  template<typename S>
-  class In_Fixed_Size_Argument_T : public Argument
+  template<typename S,
+           typename Insert_Policy>
+  class In_Fixed_Size_Argument_T : public InArgument, private Insert_Policy
   {
   public:
     In_Fixed_Size_Argument_T (S const & x);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S const & arg (void) const;
 
@@ -51,16 +52,17 @@ namespace TAO
    * @brief Template class for INOUT stub argument of fixed size IDL types.
    *
    */
-  template<typename S>
-  class Inout_Fixed_Size_Argument_T : public Argument
+  template<typename S,
+           typename Insert_Policy>
+  class Inout_Fixed_Size_Argument_T : public InoutArgument, private Insert_Policy
   {
   public:
     Inout_Fixed_Size_Argument_T (S & x);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S & arg (void);
 
@@ -74,15 +76,16 @@ namespace TAO
    * @brief Template class for OUT stub argument of fixed size IDL types.
    *
    */
-  template<typename S>
-  class Out_Fixed_Size_Argument_T : public Argument
+  template<typename S,
+           typename Insert_Policy>
+  class Out_Fixed_Size_Argument_T : public OutArgument, private Insert_Policy
   {
   public:
     Out_Fixed_Size_Argument_T (S & x);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S & arg (void);
 
@@ -97,15 +100,16 @@ namespace TAO
    * @brief Template class for return stub value of fixed size IDL types.
    *
    */
-  template<typename S>
-  class Ret_Fixed_Size_Argument_T : public Argument
+  template<typename S,
+           typename Insert_Policy>
+  class Ret_Fixed_Size_Argument_T : public RetArgument, private Insert_Policy
   {
   public:
     Ret_Fixed_Size_Argument_T (void);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_result (CORBA::Any *);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S & arg (void);
 
@@ -125,25 +129,26 @@ namespace TAO
   struct TAO_Export Fixed_Size_Tag {};
 
   /**
-   * @struct Basic_Arg_Traits_T
+   * @struct Fixed_Size_Arg_Traits_T
    *
    * @brief Template class for argument traits of fixed size IDL types.
    *
    */
-  template<typename T>
+  template<typename T,
+           typename Insert_Policy>
   struct Fixed_Size_Arg_Traits_T
   {
-    typedef T                                 ret_type;
-    typedef T const &                         in_type;
-    typedef T &                               inout_type;
-    typedef T &                               out_type;
+    typedef T                                            ret_type;
+    typedef T const &                                    in_type;
+    typedef T &                                          inout_type;
+    typedef T &                                          out_type;
 
-    typedef In_Fixed_Size_Argument_T<T>       in_arg_val;
-    typedef Inout_Fixed_Size_Argument_T<T>    inout_arg_val;
-    typedef Out_Fixed_Size_Argument_T<T>      out_arg_val;
-    typedef Ret_Fixed_Size_Argument_T<T>      ret_val;
+    typedef In_Fixed_Size_Argument_T<T,Insert_Policy>    in_arg_val;
+    typedef Inout_Fixed_Size_Argument_T<T,Insert_Policy> inout_arg_val;
+    typedef Out_Fixed_Size_Argument_T<T,Insert_Policy>   out_arg_val;
+    typedef Ret_Fixed_Size_Argument_T<T,Insert_Policy>   ret_val;
 
-    typedef Fixed_Size_Tag                    idl_tag;
+    typedef Fixed_Size_Tag                               idl_tag;
   };
 }
 
diff --git a/TAO/tao/Fixed_Size_Argument_T.inl b/TAO/tao/Fixed_Size_Argument_T.inl
index 2c057588662..bce99464476 100644
--- a/TAO/tao/Fixed_Size_Argument_T.inl
+++ b/TAO/tao/Fixed_Size_Argument_T.inl
@@ -1,78 +1,94 @@
 // $Id$
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::In_Fixed_Size_Argument_T<S>::In_Fixed_Size_Argument_T (S const & x)
+TAO::In_Fixed_Size_Argument_T<S,Insert_Policy>::
+In_Fixed_Size_Argument_T (S const & x)
   : x_ (&x)
 {}
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 ACE_INLINE
 const S &
-TAO::In_Fixed_Size_Argument_T<S>::arg (void) const
+TAO::In_Fixed_Size_Argument_T<S,Insert_Policy>::arg (void) const
 {
   return *this->x_;
 }
 
 // ==========================================================================
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Inout_Fixed_Size_Argument_T<S>::Inout_Fixed_Size_Argument_T (S & x)
+TAO::Inout_Fixed_Size_Argument_T<S,Insert_Policy>::
+Inout_Fixed_Size_Argument_T (S & x)
   : x_ (&x)
 {}
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 ACE_INLINE
 S &
-TAO::Inout_Fixed_Size_Argument_T<S>::arg (void)
+TAO::Inout_Fixed_Size_Argument_T<S,Insert_Policy>::arg (void)
 {
   return *this->x_;
 }
 
 // ==========================================================================
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Out_Fixed_Size_Argument_T<S>::Out_Fixed_Size_Argument_T (S & x)
+TAO::Out_Fixed_Size_Argument_T<S,Insert_Policy>::
+Out_Fixed_Size_Argument_T (S & x)
   : x_ (x)
-{}
+{
+}
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 ACE_INLINE
 S &
-TAO::Out_Fixed_Size_Argument_T<S>::arg (void)
+TAO::Out_Fixed_Size_Argument_T<S,Insert_Policy>::arg (void)
 {
   return this->x_;
 }
 
 // ==========================================================================
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Ret_Fixed_Size_Argument_T<S>::Ret_Fixed_Size_Argument_T (void)
-{}
+TAO::Ret_Fixed_Size_Argument_T<S,Insert_Policy>::
+Ret_Fixed_Size_Argument_T (void)
+{
+}
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 ACE_INLINE
 S &
-TAO::Ret_Fixed_Size_Argument_T<S>::arg (void)
+TAO::Ret_Fixed_Size_Argument_T<S,Insert_Policy>::arg (void)
 {
   return this->x_;
 }
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 ACE_INLINE
 S
-TAO::Ret_Fixed_Size_Argument_T<S>::excp (void)
+TAO::Ret_Fixed_Size_Argument_T<S,Insert_Policy>::excp (void)
 {
   return this->x_;
 }
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 ACE_INLINE
 S
-TAO::Ret_Fixed_Size_Argument_T<S>::retn (void)
+TAO::Ret_Fixed_Size_Argument_T<S,Insert_Policy>::retn (void)
 {
   return this->x_;
 }
diff --git a/TAO/tao/Fixed_TypeCode.cpp b/TAO/tao/Fixed_TypeCode.cpp
deleted file mode 100644
index 7be6bfa5eb6..00000000000
--- a/TAO/tao/Fixed_TypeCode.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-// $Id$
-
-#ifndef TAO_FIXED_TYPECODE_CPP
-#define TAO_FIXED_TYPECODE_CPP
-
-#include "tao/Fixed_TypeCode.h"
-#include "tao/CDR.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/Fixed_TypeCode.inl"
-#endif  /* !__ACE_INLINE__ */
-
-
-template <class RefCountPolicy>
-bool
-TAO::TypeCode::Fixed<RefCountPolicy>::tao_marshal (TAO_OutputCDR & cdr,
-                                                   CORBA::ULong) const
-{
-  // A tk_fixed TypeCode has a "simple" parameter list type (see
-  // Table 15-2 in Section 15.3.5.1 "TypeCode" in the CDR section of
-  // the CORBA specification), meaning that its parameter(s) must be
-  // marshaled immediately following the TCKind.  No CDR encapsulation
-  // is to be created.
-
-  return (cdr << this->digits_) && (cdr << this->scale_);
-}
-
-template <class RefCountPolicy>
-void
-TAO::TypeCode::Fixed<RefCountPolicy>::tao_duplicate (void)
-{
-  this->RefCountPolicy::add_ref ();
-}
-
-template <class RefCountPolicy>
-void
-TAO::TypeCode::Fixed<RefCountPolicy>::tao_release (void)
-{
-  this->RefCountPolicy::remove_ref ();
-}
-
-template <class RefCountPolicy>
-CORBA::Boolean
-TAO::TypeCode::Fixed<RefCountPolicy>::equal_i (CORBA::TypeCode_ptr tc
-                                               ACE_ENV_ARG_DECL) const
-{
-  // The following call won't throw since CORBA::TypeCode::equal() has
-  // already established the kind of tc is the same as our kind.
-  CORBA::UShort const tc_digits =
-    tc->fixed_digits (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::UShort const tc_scale =
-    tc->fixed_scale (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return (this->digits_ == tc_digits
-          && this->scale_ == tc_scale);
-}
-
-template <class RefCountPolicy>
-CORBA::Boolean
-TAO::TypeCode::Fixed<RefCountPolicy>::equivalent_i (CORBA::TypeCode_ptr tc
-                                                    ACE_ENV_ARG_DECL) const
-{
-  // Since TCKind comparisons must be performed before equal_i() is
-  // called, we can also call it to determine equivalence of
-  // tk_fixed TypeCodes.
-  return this->equal_i (tc
-                        ACE_ENV_ARG_PARAMETER);
-}
-
-template <class RefCountPolicy>
-CORBA::TypeCode_ptr
-TAO::TypeCode::Fixed<RefCountPolicy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Already compact since tk_fixed TypeCodes have no name or member
-  // names, meaning that we can simply call _duplicate() on this
-  // TypeCode.
-
-
-  // @@ There is a potential problem here if this TypeCode is a static
-  //    and const since it may have been placed in read-only memory by
-  //    the compiler.  A const_cast<> can return undefined results in
-  //    that case.
-
-  CORBA::TypeCode_ptr mutable_tc =
-    const_cast<TAO::TypeCode::Fixed<RefCountPolicy> *> (this);
-
-  return CORBA::TypeCode::_duplicate (mutable_tc);
-}
-
-template <class RefCountPolicy>
-CORBA::UShort
-TAO::TypeCode::Fixed<RefCountPolicy>::fixed_digits_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->digits_;
-}
-
-template <class RefCountPolicy>
-CORBA::UShort
-TAO::TypeCode::Fixed<RefCountPolicy>::fixed_scale_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->scale_;
-}
-
-
-#endif  /* TAO_FIXED_TYPECODE_CPP */
diff --git a/TAO/tao/Fixed_TypeCode.h b/TAO/tao/Fixed_TypeCode.h
deleted file mode 100644
index d2a41df5dc6..00000000000
--- a/TAO/tao/Fixed_TypeCode.h
+++ /dev/null
@@ -1,114 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Fixed_TypeCode.h
- *
- *  $Id$
- *
- *  Header file for @c CORBA::tk_fixed @c CORBA::TypeCodes.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_FIXED_TYPECODE_H
-#define TAO_FIXED_TYPECODE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TypeCode.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-
-    /**
-     * @class Fixed
-     *
-     * @brief @c CORBA::TypeCode implementation for the OMG IDL @fixed
-     *        types.
-     *
-     * This class implements a @c CORBA::TypeCode for the OMG IDL @c
-     * fixed types.
-     */
-    template <class RefCountPolicy>
-    class Fixed
-      : public CORBA::TypeCode
-      , private RefCountPolicy
-    {
-    public:
-
-      /// Constructor.
-      Fixed (CORBA::UShort digits, CORBA::UShort scale);
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
-      //@}
-
-    protected:
-
-      /**
-       * @name @c TAO CORBA::TypeCode Template Methods
-       *
-       * @c CORBA::TypeCode template methods specific to @c tk_fixed
-       * @c TypeCodes.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::UShort fixed_digits_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::UShort fixed_scale_i (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    private:
-
-      /// The number of significant digits.
-      CORBA::UShort const digits_;
-
-      /// The scale factor.
-      CORBA::UShort const scale_;
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/Fixed_TypeCode.inl"
-#endif  /* __ACE_INLINE__ */
-
-#ifdef ACE_TEMPLATES_REQUIRE_SOURCE
-# include "tao/Fixed_TypeCode.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
-# pragma implementation ("Fixed_TypeCode.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_FIXED_TYPECODE_H */
diff --git a/TAO/tao/Fixed_TypeCode.inl b/TAO/tao/Fixed_TypeCode.inl
deleted file mode 100644
index 9db9ca2b26d..00000000000
--- a/TAO/tao/Fixed_TypeCode.inl
+++ /dev/null
@@ -1,14 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-template <class RefCountPolicy>
-ACE_INLINE
-TAO::TypeCode::Fixed<RefCountPolicy>::Fixed (CORBA::UShort digits,
-                                             CORBA::UShort scale)
-  : CORBA::TypeCode (CORBA::tk_fixed)
-  , RefCountPolicy ()
-  , digits_ (digits)
-  , scale_ (scale)
-{
-}
diff --git a/TAO/tao/FloatSeqA.cpp b/TAO/tao/FloatSeqA.cpp
deleted file mode 100644
index c20ad0d02ba..00000000000
--- a/TAO/tao/FloatSeqA.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-// -*- 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/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "FloatSeqC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_CORBA_FloatSeq_GUARD
-#define _TAO_TYPECODE_CORBA_FloatSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_FloatSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_float,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_FloatSeq_0 =
-      &CORBA_FloatSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_FloatSeq_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_FloatSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/FloatSeq:1.0",
-    "FloatSeq",
-    &TAO::TypeCode::tc_CORBA_FloatSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_FloatSeq =
-    &_tao_tc_CORBA_FloatSeq;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::FloatSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::FloatSeq>::insert_copy (
-      _tao_any,
-      CORBA::FloatSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_FloatSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::FloatSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::FloatSeq>::insert (
-      _tao_any,
-      CORBA::FloatSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_FloatSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::FloatSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::FloatSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::FloatSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::FloatSeq>::extract (
-        _tao_any,
-        CORBA::FloatSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_FloatSeq_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/FloatSeqC.cpp b/TAO/tao/FloatSeqC.cpp
index ed0f705f682..f2ded880a74 100644
--- a/TAO/tao/FloatSeqC.cpp
+++ b/TAO/tao/FloatSeqC.cpp
@@ -26,16 +26,12 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:288
 
 
 #include "FloatSeqC.h"
 #include "tao/CDR.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
diff --git a/TAO/tao/FloatSeqC.h b/TAO/tao/FloatSeqC.h
index 84d50294951..4ddc3a0359e 100644
--- a/TAO/tao/FloatSeqC.h
+++ b/TAO/tao/FloatSeqC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_FLOATSEQC_H_
-#define _TAO_IDL_ORIG_FLOATSEQC_H_
+#ifndef _TAO_IDL_FLOATSEQC_H_
+#define _TAO_IDL_FLOATSEQC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -57,12 +57,8 @@
 #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
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace CORBA
 {
@@ -114,14 +110,9 @@ namespace CORBA
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_FloatSeq;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module CORBA
 
@@ -134,14 +125,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::FloatSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::FloatSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::FloatSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::FloatSeq *&);
-
-// TAO_IDL - Generated from
 // be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_CORBA_FloatSeq_H_
@@ -159,16 +142,12 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_FloatSeq_H_ */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
+// be\be_codegen.cpp:1062
 
 #if defined(_MSC_VER)
 #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/Flushing_Strategy.h b/TAO/tao/Flushing_Strategy.h
index 127fd743aee..4c2cf07d43f 100644
--- a/TAO/tao/Flushing_Strategy.h
+++ b/TAO/tao/Flushing_Strategy.h
@@ -15,7 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "TAO_Export.h"
+#include "tao/orbconf.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -45,7 +45,7 @@ class TAO_Queued_Message;
  * no-op.
  *
  */
-class TAO_Export TAO_Flushing_Strategy
+class TAO_Flushing_Strategy
 {
 public:
   /// Destructor
diff --git a/TAO/tao/GIOPA.cpp b/TAO/tao/GIOPA.cpp
deleted file mode 100644
index 8f51194a1f5..00000000000
--- a/TAO/tao/GIOPA.cpp
+++ /dev/null
@@ -1,329 +0,0 @@
-// -*- 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/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "GIOPC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/TypeCode_Case_T.h"
-#include "tao/Union_TypeCode_Static.h"
-#include "tao/Recursive_Type_TypeCode.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_GIOP_AddressingDisposition (
-    CORBA::tk_alias,
-    "IDL:omg.org/GIOP/AddressingDisposition:1.0",
-    "AddressingDisposition",
-    &CORBA::_tc_short);
-  
-namespace GIOP
-{
-  ::CORBA::TypeCode_ptr const _tc_AddressingDisposition =
-    &_tao_tc_GIOP_AddressingDisposition;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_GIOP_Version[] =
-  {
-    { "major", &CORBA::_tc_octet },
-    { "minor", &CORBA::_tc_octet }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_GIOP_Version (
-    CORBA::tk_struct,
-    "IDL:omg.org/GIOP/Version:1.0",
-    "Version",
-    _tao_fields_GIOP_Version,
-    2);
-  
-namespace GIOP
-{
-  ::CORBA::TypeCode_ptr const _tc_Version =
-    &_tao_tc_GIOP_Version;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_GIOP_IORAddressingInfo[] =
-  {
-    { "selected_profile_index", &CORBA::_tc_ulong },
-    { "ior", &IOP::_tc_IOR }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_GIOP_IORAddressingInfo (
-    CORBA::tk_struct,
-    "IDL:omg.org/GIOP/IORAddressingInfo:1.0",
-    "IORAddressingInfo",
-    _tao_fields_GIOP_IORAddressingInfo,
-    2);
-  
-namespace GIOP
-{
-  ::CORBA::TypeCode_ptr const _tc_IORAddressingInfo =
-    &_tao_tc_GIOP_IORAddressingInfo;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/union_typecode.cpp:58
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-static TAO::TypeCode::Case_T<CORBA::Short, char const *, CORBA::TypeCode_ptr const *> const _tao_cases_GIOP_TargetAddress_0 (0, "object_key", &CORBA::_tc_OctetSeq);
-static TAO::TypeCode::Case_T<CORBA::Short, char const *, CORBA::TypeCode_ptr const *> const _tao_cases_GIOP_TargetAddress_1 (1, "profile", &IOP::_tc_TaggedProfile);
-static TAO::TypeCode::Case_T<CORBA::Short, char const *, CORBA::TypeCode_ptr const *> const _tao_cases_GIOP_TargetAddress_2 (2, "ior", &GIOP::_tc_IORAddressingInfo);
-
-static TAO::TypeCode::Case<char const *, CORBA::TypeCode_ptr const *> const * const _tao_cases_GIOP_TargetAddress[] =
-  {
-    &_tao_cases_GIOP_TargetAddress_0,
-    &_tao_cases_GIOP_TargetAddress_1,
-    &_tao_cases_GIOP_TargetAddress_2
-    
-  };
-
-static TAO::TypeCode::Union<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::TypeCode::Case<char const *, CORBA::TypeCode_ptr const *> const * const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_GIOP_TargetAddress (
-    "IDL:omg.org/GIOP/TargetAddress:1.0",
-    "TargetAddress",
-    &CORBA::_tc_short,
-    _tao_cases_GIOP_TargetAddress,
-    3, -1);
-  
-namespace GIOP
-{
-  ::CORBA::TypeCode_ptr const _tc_TargetAddress =
-    &_tao_tc_GIOP_TargetAddress;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const GIOP::Version &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<GIOP::Version>::insert_copy (
-      _tao_any,
-      GIOP::Version::_tao_any_destructor,
-      GIOP::_tc_Version,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    GIOP::Version *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<GIOP::Version>::insert (
-      _tao_any,
-      GIOP::Version::_tao_any_destructor,
-      GIOP::_tc_Version,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    GIOP::Version *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const GIOP::Version *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const GIOP::Version *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<GIOP::Version>::extract (
-        _tao_any,
-        GIOP::Version::_tao_any_destructor,
-        GIOP::_tc_Version,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// 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_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    GIOP::IORAddressingInfo *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<GIOP::IORAddressingInfo>::insert (
-      _tao_any,
-      GIOP::IORAddressingInfo::_tao_any_destructor,
-      GIOP::_tc_IORAddressingInfo,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    GIOP::IORAddressingInfo *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const GIOP::IORAddressingInfo *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const GIOP::IORAddressingInfo *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<GIOP::IORAddressingInfo>::extract (
-        _tao_any,
-        GIOP::IORAddressingInfo::_tao_any_destructor,
-        GIOP::_tc_IORAddressingInfo,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_union/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const GIOP::TargetAddress &_tao_elem
-  )
-{
-  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::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
-  )
-{
-  return _tao_any >>= 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_Dual_Impl_T<GIOP::TargetAddress>::extract (
-        _tao_any,
-        GIOP::TargetAddress::_tao_any_destructor,
-        GIOP::_tc_TargetAddress,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/GIOPC.cpp b/TAO/tao/GIOPC.cpp
index da8775c8c5f..c969f09d9c0 100644
--- a/TAO/tao/GIOPC.cpp
+++ b/TAO/tao/GIOPC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:288
 
 
 #include "GIOPC.h"
@@ -34,10 +34,6 @@
 #include "tao/ORB_Core.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 #if !defined (__ACE_INLINE__)
 #include "GIOPC.inl"
 #endif /* !defined INLINE */
@@ -51,10 +47,10 @@ namespace TAO
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 GIOP::Version::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -64,10 +60,10 @@ GIOP::Version::_tao_any_destructor (
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 GIOP::IORAddressingInfo::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -162,10 +158,10 @@ GIOP::TargetAddress::operator= (const ::GIOP::TargetAddress &u)
     {
       return *this;
     }
-  
+
   this->_reset (u.disc_, 0);
   this->disc_ = u.disc_;
-  
+
   switch (this->disc_)
   {
     case 0:
@@ -219,7 +215,7 @@ GIOP::TargetAddress::operator= (const ::GIOP::TargetAddress &u)
     default:
     break;
   }
-  
+
   return *this;
 }
 
@@ -228,7 +224,7 @@ void GIOP::TargetAddress::_reset (CORBA::Short, CORBA::Boolean /*finalize*/)
 {
   switch (this->disc_)
   {
-    
+
     case 0:
       delete this->u_.object_key_;
       this->u_.object_key_ = 0;
@@ -255,8 +251,8 @@ CORBA::Boolean operator<< (
   )
 {
   return
-    (strm << CORBA::Any::from_octet (_tao_aggregate.major)) &&
-    (strm << CORBA::Any::from_octet (_tao_aggregate.minor));
+    (strm << ACE_OutputCDR::from_octet (_tao_aggregate.major)) &&
+    (strm << ACE_OutputCDR::from_octet (_tao_aggregate.minor));
 }
 
 CORBA::Boolean operator>> (
@@ -265,8 +261,8 @@ CORBA::Boolean operator>> (
   )
 {
   return
-    (strm >> CORBA::Any::to_octet (_tao_aggregate.major)) &&
-    (strm >> CORBA::Any::to_octet (_tao_aggregate.minor));
+    (strm >> ACE_InputCDR::to_octet (_tao_aggregate.major)) &&
+    (strm >> ACE_InputCDR::to_octet (_tao_aggregate.minor));
 }
 
 // TAO_IDL - Generated from
@@ -304,9 +300,9 @@ CORBA::Boolean operator<< (
     {
       return false;
     }
-  
+
   CORBA::Boolean result = true;
-  
+
   switch (_tao_union._d ())
   {
     case 0:
@@ -327,7 +323,7 @@ CORBA::Boolean operator<< (
     default:
       break;
   }
-  
+
   return result;
 }
 
@@ -341,16 +337,16 @@ CORBA::Boolean operator>> (
     {
       return false;
     }
-  
+
   CORBA::Boolean result = true;
-  
+
   switch (_tao_discriminant)
   {
     case 0:
       {
         CORBA::OctetSeq _tao_union_tmp;
         result = strm >> _tao_union_tmp;
-        
+
         if (result)
           {
             _tao_union.object_key (_tao_union_tmp);
@@ -362,7 +358,7 @@ CORBA::Boolean operator>> (
       {
         IOP::TaggedProfile _tao_union_tmp;
         result = strm >> _tao_union_tmp;
-        
+
         if (result)
           {
             _tao_union.profile (_tao_union_tmp);
@@ -374,7 +370,7 @@ CORBA::Boolean operator>> (
       {
         GIOP::IORAddressingInfo _tao_union_tmp;
         result = strm >> _tao_union_tmp;
-        
+
         if (result)
           {
             _tao_union.ior (_tao_union_tmp);
@@ -386,6 +382,6 @@ CORBA::Boolean operator>> (
       _tao_union._d (_tao_discriminant);
       break;
   }
-  
+
   return result;
 }
diff --git a/TAO/tao/GIOPC.h b/TAO/tao/GIOPC.h
index a4881f49a50..e85e137e6c0 100644
--- a/TAO/tao/GIOPC.h
+++ b/TAO/tao/GIOPC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_GIOPC_H_
-#define _TAO_IDL_ORIG_GIOPC_H_
+#ifndef _TAO_IDL_GIOPC_H_
+#define _TAO_IDL_GIOPC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -57,120 +57,101 @@
 #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
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace GIOP
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:379
-  
+
   typedef CORBA::Short AddressingDisposition;
   typedef CORBA::Short_out AddressingDisposition_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_AddressingDisposition;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const CORBA::Short KeyAddr = 0;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const CORBA::Short ProfileAddr = 1;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const CORBA::Short ReferenceAddr = 2;
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct Version;
-  
+
   typedef
     TAO_Fixed_Var_T<
         Version
       >
     Version_var;
-  
+
   typedef
     Version &
     Version_out;
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
+  // be\be_visitor_structure/structure_ch.cpp:57
+
   struct TAO_Export Version
   {
     typedef Version_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     CORBA::Octet major;
     CORBA::Octet minor;
   };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_Version;
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct IORAddressingInfo;
-  
+
   typedef
     TAO_Var_Var_T<
         IORAddressingInfo
       >
     IORAddressingInfo_var;
-  
+
   typedef
     TAO_Out_T<
         IORAddressingInfo,
         IORAddressingInfo_var
       >
     IORAddressingInfo_out;
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
+  // be\be_visitor_structure/structure_ch.cpp:57
+
   struct TAO_Export IORAddressingInfo
   {
     typedef IORAddressingInfo_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     CORBA::ULong selected_profile_index;
     IOP::IOR ior;
   };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_IORAddressingInfo;
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   class TargetAddress;
-  
+
   typedef
     TAO_Var_Var_T<
         TargetAddress
       >
     TargetAddress_var;
-  
+
   typedef
     TAO_Out_T<
         TargetAddress,
@@ -180,7 +161,7 @@ namespace GIOP
 
 #if !defined (_GIOP_TARGETADDRESS_CH_)
 #define _GIOP_TARGETADDRESS_CH_
-  
+
   class TAO_Export TargetAddress
   {
   public:
@@ -188,49 +169,49 @@ namespace GIOP
     TargetAddress (const TargetAddress &);
     ~TargetAddress (void);
     static void _tao_any_destructor (void*);
-    
+
     TargetAddress &operator= (const TargetAddress &);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_union/discriminant_ch.cpp:114
-    
+
     void _d (CORBA::Short);
     CORBA::Short _d (void) const;
-    
+
     // TAO_IDL - Generated from
-    // be\be_visitor_union/union_ch.cpp:108
-    
+    // be\be_visitor_union/union_ch.cpp:113
+
     typedef TargetAddress_var _var_type;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_union_branch/public_ch.cpp:557
-    
+
     void object_key (const CORBA::OctetSeq &);
     const CORBA::OctetSeq &object_key (void) const;
     CORBA::OctetSeq &object_key (void);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_union_branch/public_ch.cpp:665
-    
+
     void profile (const IOP::TaggedProfile &);
     const IOP::TaggedProfile &profile (void) const;
     IOP::TaggedProfile &profile (void);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_union_branch/public_ch.cpp:665
-    
+
     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
-    // be\be_visitor_union/union_ch.cpp:142
-    
+    // be\be_visitor_union/union_ch.cpp:147
+
     void _default (void);
   private:
     CORBA::Short disc_;
     CORBA::Short holder_;
-    
+
     union
     {
       // TAO_IDL - Generated from
@@ -243,20 +224,15 @@ namespace GIOP
       // be\be_visitor_union_branch/private_ch.cpp:526
       ACE_NESTED_CLASS (GIOP, IORAddressingInfo) *ior_;
     } u_;
-    
+
     // TAO extension - frees any allocated storage.
     void _reset (CORBA::Short, CORBA::Boolean /* finalize */);
   };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_TargetAddress;
 
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module GIOP
 
@@ -269,30 +245,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// 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
-// 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
-// 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
 // be\be_visitor_structure/cdr_op_ch.cpp:54
 
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const GIOP::Version &);
@@ -311,7 +263,7 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const GIOP::TargetAddress
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, GIOP::TargetAddress &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
+// be\be_codegen.cpp:1062
 
 #if defined (__ACE_INLINE__)
 #include "GIOPC.inl"
@@ -321,10 +273,6 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, GIOP::TargetAddress &);
 #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/GIOP_Message_Generator_Parser_10.cpp b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
index c76d5b60b18..a78149c847a 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
+++ b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
@@ -34,11 +34,11 @@ TAO_GIOP_Message_Generator_Parser_10::write_request_header (
   // Write the response flags
   if (response_flags == TAO_TWOWAY_RESPONSE_FLAG)
     {
-      msg << CORBA::Any::from_octet (1);
+      msg << ACE_OutputCDR::from_octet (1);
     }
   else
     {
-      msg << CORBA::Any::from_octet (0);
+      msg << ACE_OutputCDR::from_octet (0);
     }
 
   // In this case we cannot recognise anything other than the Object
@@ -332,7 +332,7 @@ TAO_GIOP_Message_Generator_Parser_10::parse_request_header (
   CORBA::Boolean hdr_status =
     (CORBA::Boolean) input.good_bit ();
 
-  CORBA::ULong req_id;
+  CORBA::ULong req_id = 0;
 
   // Get the rest of the request header ...
   hdr_status = hdr_status && input.read_ulong (req_id);
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp
index 34673f5d4af..5296e870b67 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp
+++ b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp
@@ -33,6 +33,7 @@ TAO_GIOP_Message_Generator_Parser_12::write_request_header (
 
   const CORBA::Octet response_flags = opdetails.response_flags ();
 
+
   // Here are the Octet values for different policies
   // '00000000' for SYNC_NONE
   // '00000000' for SYNC_WITH_TRANSPORT
@@ -43,7 +44,7 @@ TAO_GIOP_Message_Generator_Parser_12::write_request_header (
   //
   // We have not implemented the policy INV_NO_RESPONSE for DII.
   if (response_flags == TAO_TWOWAY_RESPONSE_FLAG)
-    msg << CORBA::Any::from_octet (3);
+    msg << ACE_OutputCDR::from_octet (3);
   // Second the response flags
   // Sync scope - ignored by server if request is not oneway.
   else if (response_flags == CORBA::Octet (Messaging::SYNC_NONE)
@@ -51,15 +52,15 @@ TAO_GIOP_Message_Generator_Parser_12::write_request_header (
            || response_flags == CORBA::Octet (TAO::SYNC_EAGER_BUFFERING)
            || response_flags == CORBA::Octet (TAO::SYNC_DELAYED_BUFFERING))
     // No response required.
-    msg << CORBA::Any::from_octet (0);
+    msg << ACE_OutputCDR::from_octet (0);
 
   else if (response_flags == CORBA::Octet (Messaging::SYNC_WITH_SERVER))
     // Return before dispatching to the servant
-    msg << CORBA::Any::from_octet (1);
+    msg << ACE_OutputCDR::from_octet (1);
 
   else if (response_flags == CORBA::Octet (Messaging::SYNC_WITH_TARGET))
     // Return after dispatching servant.
-    msg << CORBA::Any::from_octet (3);
+    msg << ACE_OutputCDR::from_octet (3);
   else
     // Until more flags are defined by the OMG.
     return 0;
@@ -257,7 +258,7 @@ TAO_GIOP_Message_Generator_Parser_12::parse_request_header (
 
   CORBA::Boolean hdr_status = (CORBA::Boolean) input.good_bit ();
 
-  CORBA::ULong req_id;
+  CORBA::ULong req_id = 0;
   // Get the rest of the request header ...
   hdr_status = hdr_status && input.read_ulong (req_id);
 
diff --git a/TAO/tao/GIOP_Message_Lite.cpp b/TAO/tao/GIOP_Message_Lite.cpp
index b64d83e6940..25bed7f9928 100644
--- a/TAO/tao/GIOP_Message_Lite.cpp
+++ b/TAO/tao/GIOP_Message_Lite.cpp
@@ -1199,7 +1199,7 @@ TAO_GIOP_Message_Lite::write_request_header (
   // @@ (JP) Temporary hack until all of GIOP 1.2 is implemented.
   if (response_flags == TAO_TWOWAY_RESPONSE_FLAG)
     {
-      out_stream << CORBA::Any::from_octet (1);
+      out_stream << ACE_OutputCDR::from_octet (1);
     }
   // Sync scope - ignored by server if request is not oneway.
   else if (response_flags == CORBA::Octet (Messaging::SYNC_WITH_TRANSPORT)
@@ -1208,19 +1208,19 @@ TAO_GIOP_Message_Lite::write_request_header (
            || response_flags == CORBA::Octet (TAO::SYNC_DELAYED_BUFFERING))
     {
       // No response required.
-      out_stream << CORBA::Any::from_octet (0);
+      out_stream << ACE_OutputCDR::from_octet (0);
     }
   else if (response_flags == CORBA::Octet (Messaging::SYNC_WITH_SERVER))
     {
       // Return before dispatching servant.  We're also setting the high
       // bit here. This is a temporary fix until the rest of GIOP 1.2 is
       // implemented in TAO.
-      out_stream << CORBA::Any::from_octet (129);
+      out_stream << ACE_OutputCDR::from_octet (129);
     }
   else if (response_flags == CORBA::Octet (Messaging::SYNC_WITH_TARGET))
     {
       // Return after dispatching servant.
-      out_stream << CORBA::Any::from_octet (3);
+      out_stream << ACE_OutputCDR::from_octet (3);
     }
   else
     {
@@ -1301,7 +1301,7 @@ TAO_GIOP_Message_Lite::parse_request_header (TAO_ServerRequest &request)
 
   CORBA::Boolean hdr_status = (CORBA::Boolean) input.good_bit ();
 
-  CORBA::ULong req_id;
+  CORBA::ULong req_id = 0;
 
   // Get the rest of the request header ...
   hdr_status = hdr_status && input.read_ulong (req_id);
diff --git a/TAO/tao/IFR_Client.mpc b/TAO/tao/IFR_Client.mpc
index 308c3515373..e42a060b1ef 100644
--- a/TAO/tao/IFR_Client.mpc
+++ b/TAO/tao/IFR_Client.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project : taolib, core {
+project : taolib, core, anytypecode {
   sharedname   = TAO_IFR_Client
   dynamicflags = TAO_IFR_CLIENT_BUILD_DLL
 
@@ -27,6 +27,9 @@ project : taolib, core {
     IFR_Client
   }
 
+  IDL_Files {
+  }
+
   Pkgconfig_Files {
     IFR_Client/TAO_IFR_Client.pc.in
   }
diff --git a/TAO/tao/IFR_Client/IFR_Base.pidl b/TAO/tao/IFR_Client/IFR_Base.pidl
index 5d20d202585..18cba35abea 100644
--- a/TAO/tao/IFR_Client/IFR_Base.pidl
+++ b/TAO/tao/IFR_Client/IFR_Base.pidl
@@ -14,7 +14,7 @@
  *
  * The command used to generate code from this IDL file is:
  *
- *   tao_idl -GA -Ge 1 -Sc -I../.. \
+ *   tao_idl -Ge 1 -Sc -I../.. \
  *        -Wb,export_macro=TAO_IFR_Client_Export \
  *        -Wb,export_include=ifr_client_export.h \
  *        -Wb,pre_include="ace/pre.h" \
diff --git a/TAO/tao/IFR_Client/IFR_BaseA.cpp b/TAO/tao/IFR_Client/IFR_BaseA.cpp
deleted file mode 100644
index 1ad270a8b88..00000000000
--- a/TAO/tao/IFR_Client/IFR_BaseA.cpp
+++ /dev/null
@@ -1,2979 +0,0 @@
-// -*- 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/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "IFR_BaseC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Enum_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
-#include "tao/Any_Basic_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ScopedName (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ScopedName:1.0",
-    "ScopedName",
-    &CORBA::_tc_string);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ScopedName =
-    &_tao_tc_CORBA_ScopedName;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/enum_typecode.cpp:34
-
-static char const * const _tao_enumerators_CORBA_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"
-    
-  };
-
-static TAO::TypeCode::Enum<char const *,
-                           char const * const *,
-                           TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_DefinitionKind (
-    "IDL:omg.org/CORBA/DefinitionKind:1.0",
-    "DefinitionKind",
-    _tao_enumerators_CORBA_DefinitionKind,
-    36);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_DefinitionKind =
-    &_tao_tc_CORBA_DefinitionKind;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_IRObject (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/IRObject:1.0",
-    "IRObject");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_IRObject =
-    &_tao_tc_CORBA_IRObject;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_VersionSpec (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/VersionSpec:1.0",
-    "VersionSpec",
-    &CORBA::_tc_string);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_VersionSpec =
-    &_tao_tc_CORBA_VersionSpec;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_Contained_Description[] =
-  {
-    { "kind", &CORBA::_tc_DefinitionKind },
-    { "value", &CORBA::_tc_any }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_Contained_Description (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/Contained/Description:1.0",
-    "Description",
-    _tao_fields_CORBA_Contained_Description,
-    2);
-  
-::CORBA::TypeCode_ptr const CORBA::Contained::_tc_Description =
-  &_tao_tc_CORBA_Contained_Description;
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_Contained (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/Contained:1.0",
-    "Contained");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_Contained =
-    &_tao_tc_CORBA_Contained;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-namespace CORBA
-{
-  extern ::CORBA::TypeCode_ptr const _tc_InterfaceDef;
-}
-
-
-#ifndef _TAO_TYPECODE_CORBA_InterfaceDefSeq_GUARD
-#define _TAO_TYPECODE_CORBA_InterfaceDefSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_InterfaceDefSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_InterfaceDef,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_InterfaceDefSeq_0 =
-      &CORBA_InterfaceDefSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_InterfaceDefSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_InterfaceDefSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/InterfaceDefSeq:1.0",
-    "InterfaceDefSeq",
-    &TAO::TypeCode::tc_CORBA_InterfaceDefSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_InterfaceDefSeq =
-    &_tao_tc_CORBA_InterfaceDefSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-namespace CORBA
-{
-  extern ::CORBA::TypeCode_ptr const _tc_ValueDef;
-}
-
-
-#ifndef _TAO_TYPECODE_CORBA_ValueDefSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ValueDefSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ValueDefSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_ValueDef,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ValueDefSeq_0 =
-      &CORBA_ValueDefSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ValueDefSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ValueDefSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ValueDefSeq:1.0",
-    "ValueDefSeq",
-    &TAO::TypeCode::tc_CORBA_ValueDefSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ValueDefSeq =
-    &_tao_tc_CORBA_ValueDefSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-namespace CORBA
-{
-  extern ::CORBA::TypeCode_ptr const _tc_AbstractInterfaceDef;
-}
-
-
-#ifndef _TAO_TYPECODE_CORBA_AbstractInterfaceDefSeq_GUARD
-#define _TAO_TYPECODE_CORBA_AbstractInterfaceDefSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_AbstractInterfaceDefSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_AbstractInterfaceDef,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_AbstractInterfaceDefSeq_0 =
-      &CORBA_AbstractInterfaceDefSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_AbstractInterfaceDefSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_AbstractInterfaceDefSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/AbstractInterfaceDefSeq:1.0",
-    "AbstractInterfaceDefSeq",
-    &TAO::TypeCode::tc_CORBA_AbstractInterfaceDefSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_AbstractInterfaceDefSeq =
-    &_tao_tc_CORBA_AbstractInterfaceDefSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-namespace CORBA
-{
-  extern ::CORBA::TypeCode_ptr const _tc_LocalInterfaceDef;
-}
-
-
-#ifndef _TAO_TYPECODE_CORBA_LocalInterfaceDefSeq_GUARD
-#define _TAO_TYPECODE_CORBA_LocalInterfaceDefSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_LocalInterfaceDefSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_LocalInterfaceDef,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_LocalInterfaceDefSeq_0 =
-      &CORBA_LocalInterfaceDefSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_LocalInterfaceDefSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_LocalInterfaceDefSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/LocalInterfaceDefSeq:1.0",
-    "LocalInterfaceDefSeq",
-    &TAO::TypeCode::tc_CORBA_LocalInterfaceDefSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_LocalInterfaceDefSeq =
-    &_tao_tc_CORBA_LocalInterfaceDefSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-namespace CORBA
-{
-  extern ::CORBA::TypeCode_ptr const _tc_ExtInterfaceDef;
-}
-
-
-#ifndef _TAO_TYPECODE_CORBA_ExtInterfaceDefSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ExtInterfaceDefSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ExtInterfaceDefSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_ExtInterfaceDef,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ExtInterfaceDefSeq_0 =
-      &CORBA_ExtInterfaceDefSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ExtInterfaceDefSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ExtInterfaceDefSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ExtInterfaceDefSeq:1.0",
-    "ExtInterfaceDefSeq",
-    &TAO::TypeCode::tc_CORBA_ExtInterfaceDefSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ExtInterfaceDefSeq =
-    &_tao_tc_CORBA_ExtInterfaceDefSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-namespace CORBA
-{
-  extern ::CORBA::TypeCode_ptr const _tc_ExtValueDef;
-}
-
-
-#ifndef _TAO_TYPECODE_CORBA_ExtValueDefSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ExtValueDefSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ExtValueDefSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_ExtValueDef,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ExtValueDefSeq_0 =
-      &CORBA_ExtValueDefSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ExtValueDefSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ExtValueDefSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ExtValueDefSeq:1.0",
-    "ExtValueDefSeq",
-    &TAO::TypeCode::tc_CORBA_ExtValueDefSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ExtValueDefSeq =
-    &_tao_tc_CORBA_ExtValueDefSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-namespace CORBA
-{
-  extern ::CORBA::TypeCode_ptr const _tc_ExtAbstractInterfaceDef;
-}
-
-
-#ifndef _TAO_TYPECODE_CORBA_ExtAbstractInterfaceDefSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ExtAbstractInterfaceDefSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ExtAbstractInterfaceDefSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_ExtAbstractInterfaceDef,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ExtAbstractInterfaceDefSeq_0 =
-      &CORBA_ExtAbstractInterfaceDefSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ExtAbstractInterfaceDefSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ExtAbstractInterfaceDefSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ExtAbstractInterfaceDefSeq:1.0",
-    "ExtAbstractInterfaceDefSeq",
-    &TAO::TypeCode::tc_CORBA_ExtAbstractInterfaceDefSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ExtAbstractInterfaceDefSeq =
-    &_tao_tc_CORBA_ExtAbstractInterfaceDefSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-namespace CORBA
-{
-  extern ::CORBA::TypeCode_ptr const _tc_ExtLocalInterfaceDef;
-}
-
-
-#ifndef _TAO_TYPECODE_CORBA_ExtLocalInterfaceDefSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ExtLocalInterfaceDefSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ExtLocalInterfaceDefSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_ExtLocalInterfaceDef,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ExtLocalInterfaceDefSeq_0 =
-      &CORBA_ExtLocalInterfaceDefSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ExtLocalInterfaceDefSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ExtLocalInterfaceDefSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ExtLocalInterfaceDefSeq:1.0",
-    "ExtLocalInterfaceDefSeq",
-    &TAO::TypeCode::tc_CORBA_ExtLocalInterfaceDefSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ExtLocalInterfaceDefSeq =
-    &_tao_tc_CORBA_ExtLocalInterfaceDefSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_ContainedSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ContainedSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ContainedSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_Contained,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ContainedSeq_0 =
-      &CORBA_ContainedSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ContainedSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ContainedSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ContainedSeq:1.0",
-    "ContainedSeq",
-    &TAO::TypeCode::tc_CORBA_ContainedSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ContainedSeq =
-    &_tao_tc_CORBA_ContainedSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_StructMember[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "type", &CORBA::_tc_TypeCode },
-    { "type_def", &CORBA::_tc_IDLType }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_StructMember (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/StructMember:1.0",
-    "StructMember",
-    _tao_fields_CORBA_StructMember,
-    3);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_StructMember =
-    &_tao_tc_CORBA_StructMember;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_StructMemberSeq_GUARD
-#define _TAO_TYPECODE_CORBA_StructMemberSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_StructMemberSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_StructMember,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_StructMemberSeq_0 =
-      &CORBA_StructMemberSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_StructMemberSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_StructMemberSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/StructMemberSeq:1.0",
-    "StructMemberSeq",
-    &TAO::TypeCode::tc_CORBA_StructMemberSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_StructMemberSeq =
-    &_tao_tc_CORBA_StructMemberSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_Initializer[] =
-  {
-    { "members", &CORBA::_tc_StructMemberSeq },
-    { "name", &CORBA::_tc_Identifier }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_Initializer (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/Initializer:1.0",
-    "Initializer",
-    _tao_fields_CORBA_Initializer,
-    2);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_Initializer =
-    &_tao_tc_CORBA_Initializer;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_InitializerSeq_GUARD
-#define _TAO_TYPECODE_CORBA_InitializerSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_InitializerSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_Initializer,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_InitializerSeq_0 =
-      &CORBA_InitializerSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_InitializerSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_InitializerSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/InitializerSeq:1.0",
-    "InitializerSeq",
-    &TAO::TypeCode::tc_CORBA_InitializerSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_InitializerSeq =
-    &_tao_tc_CORBA_InitializerSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ExceptionDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec },
-    { "type", &CORBA::_tc_TypeCode }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ExceptionDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/ExceptionDescription:1.0",
-    "ExceptionDescription",
-    _tao_fields_CORBA_ExceptionDescription,
-    5);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ExceptionDescription =
-    &_tao_tc_CORBA_ExceptionDescription;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_ExcDescriptionSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ExcDescriptionSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ExcDescriptionSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_ExceptionDescription,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ExcDescriptionSeq_0 =
-      &CORBA_ExcDescriptionSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ExcDescriptionSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ExcDescriptionSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ExcDescriptionSeq:1.0",
-    "ExcDescriptionSeq",
-    &TAO::TypeCode::tc_CORBA_ExcDescriptionSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ExcDescriptionSeq =
-    &_tao_tc_CORBA_ExcDescriptionSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ExtInitializer[] =
-  {
-    { "members", &CORBA::_tc_StructMemberSeq },
-    { "exceptions", &CORBA::_tc_ExcDescriptionSeq },
-    { "name", &CORBA::_tc_Identifier }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ExtInitializer (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/ExtInitializer:1.0",
-    "ExtInitializer",
-    _tao_fields_CORBA_ExtInitializer,
-    3);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ExtInitializer =
-    &_tao_tc_CORBA_ExtInitializer;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_ExtInitializerSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ExtInitializerSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ExtInitializerSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_ExtInitializer,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ExtInitializerSeq_0 =
-      &CORBA_ExtInitializerSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ExtInitializerSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ExtInitializerSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ExtInitializerSeq:1.0",
-    "ExtInitializerSeq",
-    &TAO::TypeCode::tc_CORBA_ExtInitializerSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ExtInitializerSeq =
-    &_tao_tc_CORBA_ExtInitializerSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_UnionMember[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "label", &CORBA::_tc_any },
-    { "type", &CORBA::_tc_TypeCode },
-    { "type_def", &CORBA::_tc_IDLType }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_UnionMember (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/UnionMember:1.0",
-    "UnionMember",
-    _tao_fields_CORBA_UnionMember,
-    4);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_UnionMember =
-    &_tao_tc_CORBA_UnionMember;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_UnionMemberSeq_GUARD
-#define _TAO_TYPECODE_CORBA_UnionMemberSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_UnionMemberSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_UnionMember,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_UnionMemberSeq_0 =
-      &CORBA_UnionMemberSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_UnionMemberSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_UnionMemberSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/UnionMemberSeq:1.0",
-    "UnionMemberSeq",
-    &TAO::TypeCode::tc_CORBA_UnionMemberSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_UnionMemberSeq =
-    &_tao_tc_CORBA_UnionMemberSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_EnumMemberSeq_GUARD
-#define _TAO_TYPECODE_CORBA_EnumMemberSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_EnumMemberSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_Identifier,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_EnumMemberSeq_0 =
-      &CORBA_EnumMemberSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_EnumMemberSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_EnumMemberSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/EnumMemberSeq:1.0",
-    "EnumMemberSeq",
-    &TAO::TypeCode::tc_CORBA_EnumMemberSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_EnumMemberSeq =
-    &_tao_tc_CORBA_EnumMemberSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_Container_Description[] =
-  {
-    { "contained_object", &CORBA::_tc_Contained },
-    { "kind", &CORBA::_tc_DefinitionKind },
-    { "value", &CORBA::_tc_any }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_Container_Description (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/Container/Description:1.0",
-    "Description",
-    _tao_fields_CORBA_Container_Description,
-    3);
-  
-::CORBA::TypeCode_ptr const CORBA::Container::_tc_Description =
-  &_tao_tc_CORBA_Container_Description;
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_Container_DescriptionSeq_GUARD
-#define _TAO_TYPECODE_CORBA_Container_DescriptionSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_Container_DescriptionSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::Container::_tc_Description,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_Container_DescriptionSeq_0 =
-      &CORBA_Container_DescriptionSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_Container_DescriptionSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_Container_DescriptionSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/Container/DescriptionSeq:1.0",
-    "DescriptionSeq",
-    &TAO::TypeCode::tc_CORBA_Container_DescriptionSeq_0);
-  
-::CORBA::TypeCode_ptr const CORBA::Container::_tc_DescriptionSeq =
-  &_tao_tc_CORBA_Container_DescriptionSeq;
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_Container (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/Container:1.0",
-    "Container");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_Container =
-    &_tao_tc_CORBA_Container;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_IDLType (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/IDLType:1.0",
-    "IDLType");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_IDLType =
-    &_tao_tc_CORBA_IDLType;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_TypedefDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/TypedefDef:1.0",
-    "TypedefDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_TypedefDef =
-    &_tao_tc_CORBA_TypedefDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_TypeDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec },
-    { "type", &CORBA::_tc_TypeCode }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_TypeDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/TypeDescription:1.0",
-    "TypeDescription",
-    _tao_fields_CORBA_TypeDescription,
-    5);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_TypeDescription =
-    &_tao_tc_CORBA_TypeDescription;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_enum/any_op_cs.cpp:52
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::DefinitionKind _tao_elem
-  )
-{
-  TAO::Any_Basic_Impl_T<CORBA::DefinitionKind>::insert (
-      _tao_any,
-      CORBA::_tc_DefinitionKind,
-      _tao_elem
-    );
-}
-
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::DefinitionKind &_tao_elem
-  )
-{
-  return
-    TAO::Any_Basic_Impl_T<CORBA::DefinitionKind>::extract (
-        _tao_any,
-        CORBA::_tc_DefinitionKind,
-        _tao_elem 
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::IRObject>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::IRObject_ptr _tao_elem
-  )
-{
-  CORBA::IRObject_ptr _tao_objptr =
-    CORBA::IRObject::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::IRObject_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::IRObject>::insert (
-      _tao_any,
-      CORBA::IRObject::_tao_any_destructor,
-      CORBA::_tc_IRObject,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::IRObject_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::IRObject>::extract (
-        _tao_any,
-        CORBA::IRObject::_tao_any_destructor,
-        CORBA::_tc_IRObject,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::Contained>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::Contained_ptr _tao_elem
-  )
-{
-  CORBA::Contained_ptr _tao_objptr =
-    CORBA::Contained::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::Contained_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::Contained>::insert (
-      _tao_any,
-      CORBA::Contained::_tao_any_destructor,
-      CORBA::_tc_Contained,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::Contained_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::Contained>::extract (
-        _tao_any,
-        CORBA::Contained::_tao_any_destructor,
-        CORBA::_tc_Contained,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::Contained::Description &_tao_elem
-  )
-{
-  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.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::Contained::Description *_tao_elem
-  )
-{
-  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).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::Contained::Description *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::Contained::Description *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::Contained::Description *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::Contained::Description>::extract (
-        _tao_any,
-        CORBA::Contained::Description::_tao_any_destructor,
-        CORBA::Contained::_tc_Description,
-        _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::InterfaceDefSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::InterfaceDefSeq>::insert_copy (
-      _tao_any,
-      CORBA::InterfaceDefSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_InterfaceDefSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::InterfaceDefSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::InterfaceDefSeq>::insert (
-      _tao_any,
-      CORBA::InterfaceDefSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_InterfaceDefSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::InterfaceDefSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::InterfaceDefSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::InterfaceDefSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::InterfaceDefSeq>::extract (
-        _tao_any,
-        CORBA::InterfaceDefSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_InterfaceDefSeq_0,
-        _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::ValueDefSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ValueDefSeq>::insert_copy (
-      _tao_any,
-      CORBA::ValueDefSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ValueDefSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ValueDefSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ValueDefSeq>::insert (
-      _tao_any,
-      CORBA::ValueDefSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ValueDefSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ValueDefSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ValueDefSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ValueDefSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ValueDefSeq>::extract (
-        _tao_any,
-        CORBA::ValueDefSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ValueDefSeq_0,
-        _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::AbstractInterfaceDefSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::AbstractInterfaceDefSeq>::insert_copy (
-      _tao_any,
-      CORBA::AbstractInterfaceDefSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_AbstractInterfaceDefSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::AbstractInterfaceDefSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::AbstractInterfaceDefSeq>::insert (
-      _tao_any,
-      CORBA::AbstractInterfaceDefSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_AbstractInterfaceDefSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::AbstractInterfaceDefSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::AbstractInterfaceDefSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::AbstractInterfaceDefSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::AbstractInterfaceDefSeq>::extract (
-        _tao_any,
-        CORBA::AbstractInterfaceDefSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_AbstractInterfaceDefSeq_0,
-        _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::LocalInterfaceDefSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::LocalInterfaceDefSeq>::insert_copy (
-      _tao_any,
-      CORBA::LocalInterfaceDefSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_LocalInterfaceDefSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::LocalInterfaceDefSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::LocalInterfaceDefSeq>::insert (
-      _tao_any,
-      CORBA::LocalInterfaceDefSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_LocalInterfaceDefSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::LocalInterfaceDefSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::LocalInterfaceDefSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::LocalInterfaceDefSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::LocalInterfaceDefSeq>::extract (
-        _tao_any,
-        CORBA::LocalInterfaceDefSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_LocalInterfaceDefSeq_0,
-        _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::ExtInterfaceDefSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExtInterfaceDefSeq>::insert_copy (
-      _tao_any,
-      CORBA::ExtInterfaceDefSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ExtInterfaceDefSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ExtInterfaceDefSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExtInterfaceDefSeq>::insert (
-      _tao_any,
-      CORBA::ExtInterfaceDefSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ExtInterfaceDefSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ExtInterfaceDefSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ExtInterfaceDefSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ExtInterfaceDefSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ExtInterfaceDefSeq>::extract (
-        _tao_any,
-        CORBA::ExtInterfaceDefSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ExtInterfaceDefSeq_0,
-        _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::ExtValueDefSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExtValueDefSeq>::insert_copy (
-      _tao_any,
-      CORBA::ExtValueDefSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ExtValueDefSeq_0,
-      _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,
-      TAO::TypeCode::tc_CORBA_ExtValueDefSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ExtValueDefSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= 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,
-        TAO::TypeCode::tc_CORBA_ExtValueDefSeq_0,
-        _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::ExtAbstractInterfaceDefSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExtAbstractInterfaceDefSeq>::insert_copy (
-      _tao_any,
-      CORBA::ExtAbstractInterfaceDefSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ExtAbstractInterfaceDefSeq_0,
-      _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,
-      TAO::TypeCode::tc_CORBA_ExtAbstractInterfaceDefSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ExtAbstractInterfaceDefSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= 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,
-        TAO::TypeCode::tc_CORBA_ExtAbstractInterfaceDefSeq_0,
-        _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::ExtLocalInterfaceDefSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExtLocalInterfaceDefSeq>::insert_copy (
-      _tao_any,
-      CORBA::ExtLocalInterfaceDefSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ExtLocalInterfaceDefSeq_0,
-      _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,
-      TAO::TypeCode::tc_CORBA_ExtLocalInterfaceDefSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ExtLocalInterfaceDefSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= 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,
-        TAO::TypeCode::tc_CORBA_ExtLocalInterfaceDefSeq_0,
-        _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::ContainedSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ContainedSeq>::insert_copy (
-      _tao_any,
-      CORBA::ContainedSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ContainedSeq_0,
-      _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,
-      TAO::TypeCode::tc_CORBA_ContainedSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ContainedSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= 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,
-        TAO::TypeCode::tc_CORBA_ContainedSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::StructMember &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::StructMember>::insert_copy (
-      _tao_any,
-      CORBA::StructMember::_tao_any_destructor,
-      CORBA::_tc_StructMember,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::StructMember *_tao_elem
-  )
-{
-  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).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::StructMember *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::StructMember *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::StructMember *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::StructMember>::extract (
-        _tao_any,
-        CORBA::StructMember::_tao_any_destructor,
-        CORBA::_tc_StructMember,
-        _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::StructMemberSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::StructMemberSeq>::insert_copy (
-      _tao_any,
-      CORBA::StructMemberSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_StructMemberSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::StructMemberSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::StructMemberSeq>::insert (
-      _tao_any,
-      CORBA::StructMemberSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_StructMemberSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::StructMemberSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::StructMemberSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::StructMemberSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::StructMemberSeq>::extract (
-        _tao_any,
-        CORBA::StructMemberSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_StructMemberSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::Initializer &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::Initializer>::insert_copy (
-      _tao_any,
-      CORBA::Initializer::_tao_any_destructor,
-      CORBA::_tc_Initializer,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::Initializer *_tao_elem
-  )
-{
-  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).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::Initializer *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::Initializer *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::Initializer *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::Initializer>::extract (
-        _tao_any,
-        CORBA::Initializer::_tao_any_destructor,
-        CORBA::_tc_Initializer,
-        _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::InitializerSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::InitializerSeq>::insert_copy (
-      _tao_any,
-      CORBA::InitializerSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_InitializerSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::InitializerSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::InitializerSeq>::insert (
-      _tao_any,
-      CORBA::InitializerSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_InitializerSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::InitializerSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::InitializerSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::InitializerSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::InitializerSeq>::extract (
-        _tao_any,
-        CORBA::InitializerSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_InitializerSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// 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 >>= 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
-      );
-}
-
-// 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::Any_Dual_Impl_T<CORBA::ExcDescriptionSeq>::insert_copy (
-      _tao_any,
-      CORBA::ExcDescriptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ExcDescriptionSeq_0,
-      _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,
-      TAO::TypeCode::tc_CORBA_ExcDescriptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ExcDescriptionSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= 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,
-        TAO::TypeCode::tc_CORBA_ExcDescriptionSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// 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 >>= 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
-      );
-}
-
-// TAO_IDL - Generated from 
-// 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,
-      TAO::TypeCode::tc_CORBA_ExtInitializerSeq_0,
-      _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,
-      TAO::TypeCode::tc_CORBA_ExtInitializerSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ExtInitializerSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= 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,
-        TAO::TypeCode::tc_CORBA_ExtInitializerSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::UnionMember &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::UnionMember>::insert_copy (
-      _tao_any,
-      CORBA::UnionMember::_tao_any_destructor,
-      CORBA::_tc_UnionMember,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::UnionMember *_tao_elem
-  )
-{
-  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).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::UnionMember *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::UnionMember *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::UnionMember *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::UnionMember>::extract (
-        _tao_any,
-        CORBA::UnionMember::_tao_any_destructor,
-        CORBA::_tc_UnionMember,
-        _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::UnionMemberSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::UnionMemberSeq>::insert_copy (
-      _tao_any,
-      CORBA::UnionMemberSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_UnionMemberSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::UnionMemberSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::UnionMemberSeq>::insert (
-      _tao_any,
-      CORBA::UnionMemberSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_UnionMemberSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::UnionMemberSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::UnionMemberSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::UnionMemberSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::UnionMemberSeq>::extract (
-        _tao_any,
-        CORBA::UnionMemberSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_UnionMemberSeq_0,
-        _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::EnumMemberSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::EnumMemberSeq>::insert_copy (
-      _tao_any,
-      CORBA::EnumMemberSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_EnumMemberSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::EnumMemberSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::EnumMemberSeq>::insert (
-      _tao_any,
-      CORBA::EnumMemberSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_EnumMemberSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::EnumMemberSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::EnumMemberSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::EnumMemberSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::EnumMemberSeq>::extract (
-        _tao_any,
-        CORBA::EnumMemberSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_EnumMemberSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::Container>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::Container_ptr _tao_elem
-  )
-{
-  CORBA::Container_ptr _tao_objptr =
-    CORBA::Container::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::Container_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::Container>::insert (
-      _tao_any,
-      CORBA::Container::_tao_any_destructor,
-      CORBA::_tc_Container,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::Container_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::Container>::extract (
-        _tao_any,
-        CORBA::Container::_tao_any_destructor,
-        CORBA::_tc_Container,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::Container::Description &_tao_elem
-  )
-{
-  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.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::Container::Description *_tao_elem
-  )
-{
-  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).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::Container::Description *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::Container::Description *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::Container::Description *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::Container::Description>::extract (
-        _tao_any,
-        CORBA::Container::Description::_tao_any_destructor,
-        CORBA::Container::_tc_Description,
-        _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::Container::DescriptionSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::Container::DescriptionSeq>::insert_copy (
-      _tao_any,
-      CORBA::Container::DescriptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_Container_DescriptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::Container::DescriptionSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::Container::DescriptionSeq>::insert (
-      _tao_any,
-      CORBA::Container::DescriptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_Container_DescriptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::Container::DescriptionSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::Container::DescriptionSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::Container::DescriptionSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::Container::DescriptionSeq>::extract (
-        _tao_any,
-        CORBA::Container::DescriptionSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_Container_DescriptionSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::IDLType>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::IDLType_ptr _tao_elem
-  )
-{
-  CORBA::IDLType_ptr _tao_objptr =
-    CORBA::IDLType::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::IDLType_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::IDLType>::insert (
-      _tao_any,
-      CORBA::IDLType::_tao_any_destructor,
-      CORBA::_tc_IDLType,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::IDLType_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::IDLType>::extract (
-        _tao_any,
-        CORBA::IDLType::_tao_any_destructor,
-        CORBA::_tc_IDLType,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::TypedefDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::TypedefDef_ptr _tao_elem
-  )
-{
-  CORBA::TypedefDef_ptr _tao_objptr =
-    CORBA::TypedefDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::TypedefDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::TypedefDef>::insert (
-      _tao_any,
-      CORBA::TypedefDef::_tao_any_destructor,
-      CORBA::_tc_TypedefDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::TypedefDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::TypedefDef>::extract (
-        _tao_any,
-        CORBA::TypedefDef::_tao_any_destructor,
-        CORBA::_tc_TypedefDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::TypeDescription &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::TypeDescription>::insert_copy (
-      _tao_any,
-      CORBA::TypeDescription::_tao_any_destructor,
-      CORBA::_tc_TypeDescription,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::TypeDescription *_tao_elem
-  )
-{
-  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).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::TypeDescription *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::TypeDescription *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::TypeDescription *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::TypeDescription>::extract (
-        _tao_any,
-        CORBA::TypeDescription::_tao_any_destructor,
-        CORBA::_tc_TypeDescription,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/ValueModifierC.cpp b/TAO/tao/IFR_Client/IFR_BaseA.h
index 76644c8b3c0..96586934203 100644
--- a/TAO/tao/ValueModifierC.cpp
+++ b/TAO/tao/IFR_Client/IFR_BaseA.h
@@ -26,21 +26,19 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:390
 
+#ifndef _TAO_IDL_ORIG_IFR_BASEA_H
+#define _TAO_IDL_ORIG_IFR_BASEA_H
 
-#include "ValueModifierC.h"
-#include "tao/CDR.h"
+#include /**/ "ace/pre.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
+#include "tao/IFR_Client/IFR_BaseC.h"
 
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:70
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
 
-// Arg traits specializations.
-namespace TAO
-{
-}
+#include /**/ "ace/post.h"
+#endif /* ifndef */
 
diff --git a/TAO/tao/IFR_Client/IFR_BaseC.cpp b/TAO/tao/IFR_Client/IFR_BaseC.cpp
index d33177a1829..339d9aea34e 100644
--- a/TAO/tao/IFR_Client/IFR_BaseC.cpp
+++ b/TAO/tao/IFR_Client/IFR_BaseC.cpp
@@ -26,20 +26,33 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:293
 
 
 #include "IFR_BaseC.h"
 #include "tao/CDR.h"
-#include "tao/Exception_Data.h"
+#include "tao/AnyTypeCode/orb_typesA.h"
+#include "tao/AnyTypeCode/Typecode_typesA.h"
 #include "tao/Invocation_Adapter.h"
 #include "tao/Object_T.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Enum_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Sequence_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Basic_Impl_T.h"
 #include "tao/Basic_Arguments.h"
 #include "tao/Object_Argument_T.h"
 #include "tao/Special_Basic_Arguments.h"
 #include "tao/UB_String_Arguments.h"
 #include "tao/Var_Size_Argument_T.h"
-#include "tao/Any_Arg_Traits.h"
+#include "tao/AnyTypeCode/Any_Arg_Traits.h"
 #include "ace/OS_NS_string.h"
 
 #if defined (__BORLANDC__)
@@ -51,31 +64,35 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
 {
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:709
+  // be\be_visitor_arg_traits.cpp:786
 
-#if !defined (_CORBA_DEFINITIONKIND__ARG_TRAITS_CS_)
-#define _CORBA_DEFINITIONKIND__ARG_TRAITS_CS_
+#if !defined (_CORBA_DEFINITIONKIND__ARG_TRAITS_)
+#define _CORBA_DEFINITIONKIND__ARG_TRAITS_
   
   template<>
   class Arg_Traits<CORBA::DefinitionKind>
     : public
         Basic_Arg_Traits_T<
-            CORBA::DefinitionKind
+            CORBA::DefinitionKind,
+            TAO::Any_Insert_Policy_Stream <CORBA::DefinitionKind>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_CONTAINED__ARG_TRAITS_CS_)
-#define _CORBA_CONTAINED__ARG_TRAITS_CS_
+#if !defined (_CORBA_CONTAINED__ARG_TRAITS_)
+#define _CORBA_CONTAINED__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::Contained>
@@ -84,7 +101,8 @@ namespace TAO
             CORBA::Contained_ptr,
             CORBA::Contained_var,
             CORBA::Contained_out,
-            TAO::Objref_Traits<CORBA::Contained>
+            TAO::Objref_Traits<CORBA::Contained>,
+            TAO::Any_Insert_Policy_Stream <CORBA::Contained_ptr>
           >
   {
   };
@@ -92,10 +110,10 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:751
+  // be\be_visitor_arg_traits.cpp:828
 
-#if !defined (_CORBA_CONTAINED_DESCRIPTION__ARG_TRAITS_CS_)
-#define _CORBA_CONTAINED_DESCRIPTION__ARG_TRAITS_CS_
+#if !defined (_CORBA_CONTAINED_DESCRIPTION__ARG_TRAITS_)
+#define _CORBA_CONTAINED_DESCRIPTION__ARG_TRAITS_
   
   template<>
   class Arg_Traits<CORBA::Contained::Description>
@@ -103,15 +121,19 @@ namespace TAO
         Var_Size_Arg_Traits_T<
             CORBA::Contained::Description,
             CORBA::Contained::Description_var,
-            CORBA::Contained::Description_out
+            CORBA::Contained::Description_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::Contained::Description>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_REPOSITORY__ARG_TRAITS_CS_)
-#define _CORBA_REPOSITORY__ARG_TRAITS_CS_
+#if !defined (_CORBA_REPOSITORY__ARG_TRAITS_)
+#define _CORBA_REPOSITORY__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::Repository>
@@ -120,15 +142,19 @@ namespace TAO
             CORBA::Repository_ptr,
             CORBA::Repository_var,
             CORBA::Repository_out,
-            TAO::Objref_Traits<CORBA::Repository>
+            TAO::Objref_Traits<CORBA::Repository>,
+            TAO::Any_Insert_Policy_Stream <CORBA::Repository_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_CONTAINER__ARG_TRAITS_CS_)
-#define _CORBA_CONTAINER__ARG_TRAITS_CS_
+#if !defined (_CORBA_CONTAINER__ARG_TRAITS_)
+#define _CORBA_CONTAINER__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::Container>
@@ -137,7 +163,8 @@ namespace TAO
             CORBA::Container_ptr,
             CORBA::Container_var,
             CORBA::Container_out,
-            TAO::Objref_Traits<CORBA::Container>
+            TAO::Objref_Traits<CORBA::Container>,
+            TAO::Any_Insert_Policy_Stream <CORBA::Container_ptr>
           >
   {
   };
@@ -145,10 +172,10 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
 
-#if !defined (_CORBA_CONTAINER_DESCRIPTIONSEQ__ARG_TRAITS_CS_)
-#define _CORBA_CONTAINER_DESCRIPTIONSEQ__ARG_TRAITS_CS_
+#if !defined (_CORBA_CONTAINER_DESCRIPTIONSEQ__ARG_TRAITS_)
+#define _CORBA_CONTAINER_DESCRIPTIONSEQ__ARG_TRAITS_
   
   template<>
   class Arg_Traits<CORBA::Container::DescriptionSeq>
@@ -156,15 +183,19 @@ namespace TAO
         Var_Size_Arg_Traits_T<
             CORBA::Container::DescriptionSeq,
             CORBA::Container::DescriptionSeq_var,
-            CORBA::Container::DescriptionSeq_out
+            CORBA::Container::DescriptionSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::Container::DescriptionSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_MODULEDEF__ARG_TRAITS_CS_)
-#define _CORBA_MODULEDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_MODULEDEF__ARG_TRAITS_)
+#define _CORBA_MODULEDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ModuleDef>
@@ -173,15 +204,19 @@ namespace TAO
             CORBA::ModuleDef_ptr,
             CORBA::ModuleDef_var,
             CORBA::ModuleDef_out,
-            TAO::Objref_Traits<CORBA::ModuleDef>
+            TAO::Objref_Traits<CORBA::ModuleDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ModuleDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_CONSTANTDEF__ARG_TRAITS_CS_)
-#define _CORBA_CONSTANTDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_CONSTANTDEF__ARG_TRAITS_)
+#define _CORBA_CONSTANTDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ConstantDef>
@@ -190,15 +225,19 @@ namespace TAO
             CORBA::ConstantDef_ptr,
             CORBA::ConstantDef_var,
             CORBA::ConstantDef_out,
-            TAO::Objref_Traits<CORBA::ConstantDef>
+            TAO::Objref_Traits<CORBA::ConstantDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ConstantDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_IDLTYPE__ARG_TRAITS_CS_)
-#define _CORBA_IDLTYPE__ARG_TRAITS_CS_
+#if !defined (_CORBA_IDLTYPE__ARG_TRAITS_)
+#define _CORBA_IDLTYPE__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::IDLType>
@@ -207,15 +246,19 @@ namespace TAO
             CORBA::IDLType_ptr,
             CORBA::IDLType_var,
             CORBA::IDLType_out,
-            TAO::Objref_Traits<CORBA::IDLType>
+            TAO::Objref_Traits<CORBA::IDLType>,
+            TAO::Any_Insert_Policy_Stream <CORBA::IDLType_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_STRUCTDEF__ARG_TRAITS_CS_)
-#define _CORBA_STRUCTDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_STRUCTDEF__ARG_TRAITS_)
+#define _CORBA_STRUCTDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::StructDef>
@@ -224,15 +267,19 @@ namespace TAO
             CORBA::StructDef_ptr,
             CORBA::StructDef_var,
             CORBA::StructDef_out,
-            TAO::Objref_Traits<CORBA::StructDef>
+            TAO::Objref_Traits<CORBA::StructDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::StructDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_UNIONDEF__ARG_TRAITS_CS_)
-#define _CORBA_UNIONDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_UNIONDEF__ARG_TRAITS_)
+#define _CORBA_UNIONDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::UnionDef>
@@ -241,15 +288,19 @@ namespace TAO
             CORBA::UnionDef_ptr,
             CORBA::UnionDef_var,
             CORBA::UnionDef_out,
-            TAO::Objref_Traits<CORBA::UnionDef>
+            TAO::Objref_Traits<CORBA::UnionDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::UnionDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_ENUMDEF__ARG_TRAITS_CS_)
-#define _CORBA_ENUMDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_ENUMDEF__ARG_TRAITS_)
+#define _CORBA_ENUMDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::EnumDef>
@@ -258,15 +309,19 @@ namespace TAO
             CORBA::EnumDef_ptr,
             CORBA::EnumDef_var,
             CORBA::EnumDef_out,
-            TAO::Objref_Traits<CORBA::EnumDef>
+            TAO::Objref_Traits<CORBA::EnumDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::EnumDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_ALIASDEF__ARG_TRAITS_CS_)
-#define _CORBA_ALIASDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_ALIASDEF__ARG_TRAITS_)
+#define _CORBA_ALIASDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::AliasDef>
@@ -275,15 +330,19 @@ namespace TAO
             CORBA::AliasDef_ptr,
             CORBA::AliasDef_var,
             CORBA::AliasDef_out,
-            TAO::Objref_Traits<CORBA::AliasDef>
+            TAO::Objref_Traits<CORBA::AliasDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::AliasDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_INTERFACEDEF__ARG_TRAITS_CS_)
-#define _CORBA_INTERFACEDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_INTERFACEDEF__ARG_TRAITS_)
+#define _CORBA_INTERFACEDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::InterfaceDef>
@@ -292,7 +351,8 @@ namespace TAO
             CORBA::InterfaceDef_ptr,
             CORBA::InterfaceDef_var,
             CORBA::InterfaceDef_out,
-            TAO::Objref_Traits<CORBA::InterfaceDef>
+            TAO::Objref_Traits<CORBA::InterfaceDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::InterfaceDef_ptr>
           >
   {
   };
@@ -300,10 +360,10 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
 
-#if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_CS_)
-#define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_CS_
+#if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_)
+#define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_
   
   template<>
   class Arg_Traits<CORBA::InterfaceDefSeq>
@@ -311,15 +371,19 @@ namespace TAO
         Var_Size_Arg_Traits_T<
             CORBA::InterfaceDefSeq,
             CORBA::InterfaceDefSeq_var,
-            CORBA::InterfaceDefSeq_out
+            CORBA::InterfaceDefSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::InterfaceDefSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_EXCEPTIONDEF__ARG_TRAITS_CS_)
-#define _CORBA_EXCEPTIONDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_EXCEPTIONDEF__ARG_TRAITS_)
+#define _CORBA_EXCEPTIONDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ExceptionDef>
@@ -328,15 +392,19 @@ namespace TAO
             CORBA::ExceptionDef_ptr,
             CORBA::ExceptionDef_var,
             CORBA::ExceptionDef_out,
-            TAO::Objref_Traits<CORBA::ExceptionDef>
+            TAO::Objref_Traits<CORBA::ExceptionDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ExceptionDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_NATIVEDEF__ARG_TRAITS_CS_)
-#define _CORBA_NATIVEDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_NATIVEDEF__ARG_TRAITS_)
+#define _CORBA_NATIVEDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::NativeDef>
@@ -345,15 +413,19 @@ namespace TAO
             CORBA::NativeDef_ptr,
             CORBA::NativeDef_var,
             CORBA::NativeDef_out,
-            TAO::Objref_Traits<CORBA::NativeDef>
+            TAO::Objref_Traits<CORBA::NativeDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::NativeDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_VALUEDEF__ARG_TRAITS_CS_)
-#define _CORBA_VALUEDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_VALUEDEF__ARG_TRAITS_)
+#define _CORBA_VALUEDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ValueDef>
@@ -362,7 +434,8 @@ namespace TAO
             CORBA::ValueDef_ptr,
             CORBA::ValueDef_var,
             CORBA::ValueDef_out,
-            TAO::Objref_Traits<CORBA::ValueDef>
+            TAO::Objref_Traits<CORBA::ValueDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ValueDef_ptr>
           >
   {
   };
@@ -370,10 +443,10 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
 
-#if !defined (_CORBA_VALUEDEFSEQ__ARG_TRAITS_CS_)
-#define _CORBA_VALUEDEFSEQ__ARG_TRAITS_CS_
+#if !defined (_CORBA_VALUEDEFSEQ__ARG_TRAITS_)
+#define _CORBA_VALUEDEFSEQ__ARG_TRAITS_
   
   template<>
   class Arg_Traits<CORBA::ValueDefSeq>
@@ -381,15 +454,19 @@ namespace TAO
         Var_Size_Arg_Traits_T<
             CORBA::ValueDefSeq,
             CORBA::ValueDefSeq_var,
-            CORBA::ValueDefSeq_out
+            CORBA::ValueDefSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ValueDefSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_VALUEBOXDEF__ARG_TRAITS_CS_)
-#define _CORBA_VALUEBOXDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_VALUEBOXDEF__ARG_TRAITS_)
+#define _CORBA_VALUEBOXDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ValueBoxDef>
@@ -398,15 +475,19 @@ namespace TAO
             CORBA::ValueBoxDef_ptr,
             CORBA::ValueBoxDef_var,
             CORBA::ValueBoxDef_out,
-            TAO::Objref_Traits<CORBA::ValueBoxDef>
+            TAO::Objref_Traits<CORBA::ValueBoxDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ValueBoxDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_ABSTRACTINTERFACEDEF__ARG_TRAITS_CS_)
-#define _CORBA_ABSTRACTINTERFACEDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_ABSTRACTINTERFACEDEF__ARG_TRAITS_)
+#define _CORBA_ABSTRACTINTERFACEDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::AbstractInterfaceDef>
@@ -415,7 +496,8 @@ namespace TAO
             CORBA::AbstractInterfaceDef_ptr,
             CORBA::AbstractInterfaceDef_var,
             CORBA::AbstractInterfaceDef_out,
-            TAO::Objref_Traits<CORBA::AbstractInterfaceDef>
+            TAO::Objref_Traits<CORBA::AbstractInterfaceDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::AbstractInterfaceDef_ptr>
           >
   {
   };
@@ -423,10 +505,10 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
 
-#if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ__ARG_TRAITS_CS_)
-#define _CORBA_ABSTRACTINTERFACEDEFSEQ__ARG_TRAITS_CS_
+#if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ__ARG_TRAITS_)
+#define _CORBA_ABSTRACTINTERFACEDEFSEQ__ARG_TRAITS_
   
   template<>
   class Arg_Traits<CORBA::AbstractInterfaceDefSeq>
@@ -434,15 +516,19 @@ namespace TAO
         Var_Size_Arg_Traits_T<
             CORBA::AbstractInterfaceDefSeq,
             CORBA::AbstractInterfaceDefSeq_var,
-            CORBA::AbstractInterfaceDefSeq_out
+            CORBA::AbstractInterfaceDefSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::AbstractInterfaceDefSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_LOCALINTERFACEDEF__ARG_TRAITS_CS_)
-#define _CORBA_LOCALINTERFACEDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_LOCALINTERFACEDEF__ARG_TRAITS_)
+#define _CORBA_LOCALINTERFACEDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::LocalInterfaceDef>
@@ -451,15 +537,19 @@ namespace TAO
             CORBA::LocalInterfaceDef_ptr,
             CORBA::LocalInterfaceDef_var,
             CORBA::LocalInterfaceDef_out,
-            TAO::Objref_Traits<CORBA::LocalInterfaceDef>
+            TAO::Objref_Traits<CORBA::LocalInterfaceDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::LocalInterfaceDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_EXTVALUEDEF__ARG_TRAITS_CS_)
-#define _CORBA_EXTVALUEDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_EXTVALUEDEF__ARG_TRAITS_)
+#define _CORBA_EXTVALUEDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ExtValueDef>
@@ -468,7 +558,8 @@ namespace TAO
             CORBA::ExtValueDef_ptr,
             CORBA::ExtValueDef_var,
             CORBA::ExtValueDef_out,
-            TAO::Objref_Traits<CORBA::ExtValueDef>
+            TAO::Objref_Traits<CORBA::ExtValueDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ExtValueDef_ptr>
           >
   {
   };
@@ -476,10 +567,10 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
 
-#if !defined (_CORBA_CONTAINEDSEQ__ARG_TRAITS_CS_)
-#define _CORBA_CONTAINEDSEQ__ARG_TRAITS_CS_
+#if !defined (_CORBA_CONTAINEDSEQ__ARG_TRAITS_)
+#define _CORBA_CONTAINEDSEQ__ARG_TRAITS_
   
   template<>
   class Arg_Traits<CORBA::ContainedSeq>
@@ -487,7 +578,8 @@ namespace TAO
         Var_Size_Arg_Traits_T<
             CORBA::ContainedSeq,
             CORBA::ContainedSeq_var,
-            CORBA::ContainedSeq_out
+            CORBA::ContainedSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ContainedSeq>
           >
   {
   };
@@ -495,10 +587,10 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
 
-#if !defined (_CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_CS_)
-#define _CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_CS_
+#if !defined (_CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_)
+#define _CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_
   
   template<>
   class Arg_Traits<CORBA::StructMemberSeq>
@@ -506,7 +598,8 @@ namespace TAO
         Var_Size_Arg_Traits_T<
             CORBA::StructMemberSeq,
             CORBA::StructMemberSeq_var,
-            CORBA::StructMemberSeq_out
+            CORBA::StructMemberSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::StructMemberSeq>
           >
   {
   };
@@ -514,10 +607,10 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
 
-#if !defined (_CORBA_INITIALIZERSEQ__ARG_TRAITS_CS_)
-#define _CORBA_INITIALIZERSEQ__ARG_TRAITS_CS_
+#if !defined (_CORBA_INITIALIZERSEQ__ARG_TRAITS_)
+#define _CORBA_INITIALIZERSEQ__ARG_TRAITS_
   
   template<>
   class Arg_Traits<CORBA::InitializerSeq>
@@ -525,7 +618,8 @@ namespace TAO
         Var_Size_Arg_Traits_T<
             CORBA::InitializerSeq,
             CORBA::InitializerSeq_var,
-            CORBA::InitializerSeq_out
+            CORBA::InitializerSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::InitializerSeq>
           >
   {
   };
@@ -533,10 +627,10 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
 
-#if !defined (_CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_CS_)
-#define _CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_CS_
+#if !defined (_CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_)
+#define _CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_
   
   template<>
   class Arg_Traits<CORBA::ExtInitializerSeq>
@@ -544,7 +638,8 @@ namespace TAO
         Var_Size_Arg_Traits_T<
             CORBA::ExtInitializerSeq,
             CORBA::ExtInitializerSeq_var,
-            CORBA::ExtInitializerSeq_out
+            CORBA::ExtInitializerSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ExtInitializerSeq>
           >
   {
   };
@@ -552,10 +647,10 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
 
-#if !defined (_CORBA_UNIONMEMBERSEQ__ARG_TRAITS_CS_)
-#define _CORBA_UNIONMEMBERSEQ__ARG_TRAITS_CS_
+#if !defined (_CORBA_UNIONMEMBERSEQ__ARG_TRAITS_)
+#define _CORBA_UNIONMEMBERSEQ__ARG_TRAITS_
   
   template<>
   class Arg_Traits<CORBA::UnionMemberSeq>
@@ -563,7 +658,8 @@ namespace TAO
         Var_Size_Arg_Traits_T<
             CORBA::UnionMemberSeq,
             CORBA::UnionMemberSeq_var,
-            CORBA::UnionMemberSeq_out
+            CORBA::UnionMemberSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::UnionMemberSeq>
           >
   {
   };
@@ -571,10 +667,10 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
 
-#if !defined (_CORBA_ENUMMEMBERSEQ__ARG_TRAITS_CS_)
-#define _CORBA_ENUMMEMBERSEQ__ARG_TRAITS_CS_
+#if !defined (_CORBA_ENUMMEMBERSEQ__ARG_TRAITS_)
+#define _CORBA_ENUMMEMBERSEQ__ARG_TRAITS_
   
   template<>
   class Arg_Traits<CORBA::EnumMemberSeq>
@@ -582,7 +678,8 @@ namespace TAO
         Var_Size_Arg_Traits_T<
             CORBA::EnumMemberSeq,
             CORBA::EnumMemberSeq_var,
-            CORBA::EnumMemberSeq_out
+            CORBA::EnumMemberSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::EnumMemberSeq>
           >
   {
   };
@@ -592,6 +689,87 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ScopedName (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/ScopedName:1.0",
+    "ScopedName",
+    &CORBA::_tc_string);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ScopedName =
+    &_tao_tc_CORBA_ScopedName;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/enum_typecode.cpp:34
+
+static char const * const _tao_enumerators_CORBA_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"
+    
+  };
+
+static TAO::TypeCode::Enum<char const *,
+                           char const * const *,
+                           TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_DefinitionKind (
+    "IDL:omg.org/CORBA/DefinitionKind:1.0",
+    "DefinitionKind",
+    _tao_enumerators_CORBA_DefinitionKind,
+    36);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_DefinitionKind =
+    &_tao_tc_CORBA_DefinitionKind;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::IRObject.
@@ -653,7 +831,7 @@ TAO::Collocation_Proxy_Broker *
       CORBA_IRObject_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::DefinitionKind>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::DefinitionKind>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -829,6 +1007,44 @@ CORBA::IRObject::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_IRObject (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/IRObject:1.0",
+    "IRObject");
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_IRObject =
+    &_tao_tc_CORBA_IRObject;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_VersionSpec (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/VersionSpec:1.0",
+    "VersionSpec",
+    &CORBA::_tc_string);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_VersionSpec =
+    &_tao_tc_CORBA_VersionSpec;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::Contained.
@@ -890,7 +1106,7 @@ char * CORBA::Contained::id (
       CORBA_Contained_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::RepositoryId>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -934,7 +1150,7 @@ void CORBA::Contained::id (
     }
   
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -975,7 +1191,7 @@ char * CORBA::Contained::name (
       CORBA_Contained_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::Identifier>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::Identifier>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1019,7 +1235,7 @@ void CORBA::Contained::name (
     }
   
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1060,7 +1276,7 @@ char * CORBA::Contained::version (
       CORBA_Contained_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::VersionSpec>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1104,7 +1320,7 @@ void CORBA::Contained::version (
     }
   
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1145,7 +1361,7 @@ void CORBA::Contained::version (
       CORBA_Contained_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::Container>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::Container>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1187,7 +1403,7 @@ char * CORBA::Contained::absolute_name (
       CORBA_Contained_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ScopedName>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::ScopedName>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1229,7 +1445,7 @@ char * CORBA::Contained::absolute_name (
       CORBA_Contained_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::Repository>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::Repository>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1251,6 +1467,29 @@ char * CORBA::Contained::absolute_name (
   return _tao_retval.retn ();
 }
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_Contained_Description[] =
+  {
+    { "kind", &CORBA::_tc_DefinitionKind },
+    { "value", &CORBA::_tc_any }
+    
+  };
+static TAO::TypeCode::Struct<char const *,
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_Contained_Description (
+    CORBA::tk_struct,
+    "IDL:omg.org/CORBA/Contained/Description:1.0",
+    "Description",
+    _tao_fields_CORBA_Contained_Description,
+    2);
+  
+::CORBA::TypeCode_ptr const CORBA::Contained::_tc_Description =
+  &_tao_tc_CORBA_Contained_Description;
+
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
@@ -1284,7 +1523,7 @@ CORBA::Contained::Description::_tao_any_destructor (
       CORBA_Contained_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::Contained::Description>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::Contained::Description>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1330,9 +1569,9 @@ void CORBA::Contained::move (
     }
   
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::Container>::in_arg_val _tao_new_container (new_container);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_new_name (new_name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_new_version (new_version);
+  TAO::Arg_Traits< ::CORBA::Container>::in_arg_val _tao_new_container (new_container);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_new_name (new_name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_new_version (new_version);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1474,6 +1713,24 @@ CORBA::Contained::marshal (TAO_OutputCDR &cdr)
   return (cdr << this);
 }
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_Contained (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/Contained:1.0",
+    "Contained");
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_Contained =
+    &_tao_tc_CORBA_Contained;
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
@@ -1487,8 +1744,8 @@ CORBA::InterfaceDefSeq::InterfaceDefSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::InterfaceDef,
-        CORBA::InterfaceDef_var
+        InterfaceDef,
+        InterfaceDef_var
       >
     (max)
 {}
@@ -1500,8 +1757,8 @@ CORBA::InterfaceDefSeq::InterfaceDefSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::InterfaceDef,
-        CORBA::InterfaceDef_var
+        InterfaceDef,
+        InterfaceDef_var
       >
     (max, length, buffer, release)
 {}
@@ -1510,8 +1767,8 @@ CORBA::InterfaceDefSeq::InterfaceDefSeq (
     const InterfaceDefSeq &seq
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::InterfaceDef,
-        CORBA::InterfaceDef_var
+        InterfaceDef,
+        InterfaceDef_var
       >
     (seq)
 {}
@@ -1530,6 +1787,59 @@ void CORBA::InterfaceDefSeq::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+namespace CORBA
+{
+  extern ::CORBA::TypeCode_ptr const _tc_InterfaceDef;
+}
+
+
+#ifndef _TAO_TYPECODE_CORBA_InterfaceDefSeq_GUARD
+#define _TAO_TYPECODE_CORBA_InterfaceDefSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_InterfaceDefSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::_tc_InterfaceDef,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_CORBA_InterfaceDefSeq_0 =
+      &CORBA_InterfaceDefSeq_0;
+    
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_InterfaceDefSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_InterfaceDefSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/InterfaceDefSeq:1.0",
+    "InterfaceDefSeq",
+    &TAO::TypeCode::tc_CORBA_InterfaceDefSeq_0);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_InterfaceDefSeq =
+    &_tao_tc_CORBA_InterfaceDefSeq;
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
@@ -1543,8 +1853,8 @@ CORBA::ValueDefSeq::ValueDefSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::ValueDef,
-        CORBA::ValueDef_var
+        ValueDef,
+        ValueDef_var
       >
     (max)
 {}
@@ -1556,8 +1866,8 @@ CORBA::ValueDefSeq::ValueDefSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::ValueDef,
-        CORBA::ValueDef_var
+        ValueDef,
+        ValueDef_var
       >
     (max, length, buffer, release)
 {}
@@ -1566,8 +1876,8 @@ CORBA::ValueDefSeq::ValueDefSeq (
     const ValueDefSeq &seq
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::ValueDef,
-        CORBA::ValueDef_var
+        ValueDef,
+        ValueDef_var
       >
     (seq)
 {}
@@ -1586,6 +1896,59 @@ void CORBA::ValueDefSeq::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+namespace CORBA
+{
+  extern ::CORBA::TypeCode_ptr const _tc_ValueDef;
+}
+
+
+#ifndef _TAO_TYPECODE_CORBA_ValueDefSeq_GUARD
+#define _TAO_TYPECODE_CORBA_ValueDefSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_ValueDefSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::_tc_ValueDef,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_CORBA_ValueDefSeq_0 =
+      &CORBA_ValueDefSeq_0;
+    
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_ValueDefSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ValueDefSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/ValueDefSeq:1.0",
+    "ValueDefSeq",
+    &TAO::TypeCode::tc_CORBA_ValueDefSeq_0);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ValueDefSeq =
+    &_tao_tc_CORBA_ValueDefSeq;
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
@@ -1599,8 +1962,8 @@ CORBA::AbstractInterfaceDefSeq::AbstractInterfaceDefSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::AbstractInterfaceDef,
-        CORBA::AbstractInterfaceDef_var
+        AbstractInterfaceDef,
+        AbstractInterfaceDef_var
       >
     (max)
 {}
@@ -1612,8 +1975,8 @@ CORBA::AbstractInterfaceDefSeq::AbstractInterfaceDefSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::AbstractInterfaceDef,
-        CORBA::AbstractInterfaceDef_var
+        AbstractInterfaceDef,
+        AbstractInterfaceDef_var
       >
     (max, length, buffer, release)
 {}
@@ -1622,8 +1985,8 @@ CORBA::AbstractInterfaceDefSeq::AbstractInterfaceDefSeq (
     const AbstractInterfaceDefSeq &seq
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::AbstractInterfaceDef,
-        CORBA::AbstractInterfaceDef_var
+        AbstractInterfaceDef,
+        AbstractInterfaceDef_var
       >
     (seq)
 {}
@@ -1642,6 +2005,59 @@ void CORBA::AbstractInterfaceDefSeq::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+namespace CORBA
+{
+  extern ::CORBA::TypeCode_ptr const _tc_AbstractInterfaceDef;
+}
+
+
+#ifndef _TAO_TYPECODE_CORBA_AbstractInterfaceDefSeq_GUARD
+#define _TAO_TYPECODE_CORBA_AbstractInterfaceDefSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_AbstractInterfaceDefSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::_tc_AbstractInterfaceDef,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_CORBA_AbstractInterfaceDefSeq_0 =
+      &CORBA_AbstractInterfaceDefSeq_0;
+    
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_AbstractInterfaceDefSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_AbstractInterfaceDefSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/AbstractInterfaceDefSeq:1.0",
+    "AbstractInterfaceDefSeq",
+    &TAO::TypeCode::tc_CORBA_AbstractInterfaceDefSeq_0);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_AbstractInterfaceDefSeq =
+    &_tao_tc_CORBA_AbstractInterfaceDefSeq;
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
@@ -1655,8 +2071,8 @@ CORBA::LocalInterfaceDefSeq::LocalInterfaceDefSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::LocalInterfaceDef,
-        CORBA::LocalInterfaceDef_var
+        LocalInterfaceDef,
+        LocalInterfaceDef_var
       >
     (max)
 {}
@@ -1668,8 +2084,8 @@ CORBA::LocalInterfaceDefSeq::LocalInterfaceDefSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::LocalInterfaceDef,
-        CORBA::LocalInterfaceDef_var
+        LocalInterfaceDef,
+        LocalInterfaceDef_var
       >
     (max, length, buffer, release)
 {}
@@ -1678,8 +2094,8 @@ CORBA::LocalInterfaceDefSeq::LocalInterfaceDefSeq (
     const LocalInterfaceDefSeq &seq
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::LocalInterfaceDef,
-        CORBA::LocalInterfaceDef_var
+        LocalInterfaceDef,
+        LocalInterfaceDef_var
       >
     (seq)
 {}
@@ -1698,6 +2114,59 @@ void CORBA::LocalInterfaceDefSeq::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+namespace CORBA
+{
+  extern ::CORBA::TypeCode_ptr const _tc_LocalInterfaceDef;
+}
+
+
+#ifndef _TAO_TYPECODE_CORBA_LocalInterfaceDefSeq_GUARD
+#define _TAO_TYPECODE_CORBA_LocalInterfaceDefSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_LocalInterfaceDefSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::_tc_LocalInterfaceDef,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_CORBA_LocalInterfaceDefSeq_0 =
+      &CORBA_LocalInterfaceDefSeq_0;
+    
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_LocalInterfaceDefSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_LocalInterfaceDefSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/LocalInterfaceDefSeq:1.0",
+    "LocalInterfaceDefSeq",
+    &TAO::TypeCode::tc_CORBA_LocalInterfaceDefSeq_0);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_LocalInterfaceDefSeq =
+    &_tao_tc_CORBA_LocalInterfaceDefSeq;
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
@@ -1711,8 +2180,8 @@ CORBA::ExtInterfaceDefSeq::ExtInterfaceDefSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::ExtInterfaceDef,
-        CORBA::ExtInterfaceDef_var
+        ExtInterfaceDef,
+        ExtInterfaceDef_var
       >
     (max)
 {}
@@ -1724,8 +2193,8 @@ CORBA::ExtInterfaceDefSeq::ExtInterfaceDefSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::ExtInterfaceDef,
-        CORBA::ExtInterfaceDef_var
+        ExtInterfaceDef,
+        ExtInterfaceDef_var
       >
     (max, length, buffer, release)
 {}
@@ -1734,8 +2203,8 @@ CORBA::ExtInterfaceDefSeq::ExtInterfaceDefSeq (
     const ExtInterfaceDefSeq &seq
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::ExtInterfaceDef,
-        CORBA::ExtInterfaceDef_var
+        ExtInterfaceDef,
+        ExtInterfaceDef_var
       >
     (seq)
 {}
@@ -1754,6 +2223,59 @@ void CORBA::ExtInterfaceDefSeq::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+namespace CORBA
+{
+  extern ::CORBA::TypeCode_ptr const _tc_ExtInterfaceDef;
+}
+
+
+#ifndef _TAO_TYPECODE_CORBA_ExtInterfaceDefSeq_GUARD
+#define _TAO_TYPECODE_CORBA_ExtInterfaceDefSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_ExtInterfaceDefSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::_tc_ExtInterfaceDef,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_CORBA_ExtInterfaceDefSeq_0 =
+      &CORBA_ExtInterfaceDefSeq_0;
+    
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_ExtInterfaceDefSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ExtInterfaceDefSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/ExtInterfaceDefSeq:1.0",
+    "ExtInterfaceDefSeq",
+    &TAO::TypeCode::tc_CORBA_ExtInterfaceDefSeq_0);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ExtInterfaceDefSeq =
+    &_tao_tc_CORBA_ExtInterfaceDefSeq;
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
@@ -1767,8 +2289,8 @@ CORBA::ExtValueDefSeq::ExtValueDefSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::ExtValueDef,
-        CORBA::ExtValueDef_var
+        ExtValueDef,
+        ExtValueDef_var
       >
     (max)
 {}
@@ -1780,8 +2302,8 @@ CORBA::ExtValueDefSeq::ExtValueDefSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::ExtValueDef,
-        CORBA::ExtValueDef_var
+        ExtValueDef,
+        ExtValueDef_var
       >
     (max, length, buffer, release)
 {}
@@ -1790,8 +2312,8 @@ CORBA::ExtValueDefSeq::ExtValueDefSeq (
     const ExtValueDefSeq &seq
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::ExtValueDef,
-        CORBA::ExtValueDef_var
+        ExtValueDef,
+        ExtValueDef_var
       >
     (seq)
 {}
@@ -1810,6 +2332,59 @@ void CORBA::ExtValueDefSeq::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+namespace CORBA
+{
+  extern ::CORBA::TypeCode_ptr const _tc_ExtValueDef;
+}
+
+
+#ifndef _TAO_TYPECODE_CORBA_ExtValueDefSeq_GUARD
+#define _TAO_TYPECODE_CORBA_ExtValueDefSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_ExtValueDefSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::_tc_ExtValueDef,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_CORBA_ExtValueDefSeq_0 =
+      &CORBA_ExtValueDefSeq_0;
+    
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_ExtValueDefSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ExtValueDefSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/ExtValueDefSeq:1.0",
+    "ExtValueDefSeq",
+    &TAO::TypeCode::tc_CORBA_ExtValueDefSeq_0);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ExtValueDefSeq =
+    &_tao_tc_CORBA_ExtValueDefSeq;
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
@@ -1823,8 +2398,8 @@ CORBA::ExtAbstractInterfaceDefSeq::ExtAbstractInterfaceDefSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::ExtAbstractInterfaceDef,
-        CORBA::ExtAbstractInterfaceDef_var
+        ExtAbstractInterfaceDef,
+        ExtAbstractInterfaceDef_var
       >
     (max)
 {}
@@ -1836,8 +2411,8 @@ CORBA::ExtAbstractInterfaceDefSeq::ExtAbstractInterfaceDefSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::ExtAbstractInterfaceDef,
-        CORBA::ExtAbstractInterfaceDef_var
+        ExtAbstractInterfaceDef,
+        ExtAbstractInterfaceDef_var
       >
     (max, length, buffer, release)
 {}
@@ -1846,8 +2421,8 @@ CORBA::ExtAbstractInterfaceDefSeq::ExtAbstractInterfaceDefSeq (
     const ExtAbstractInterfaceDefSeq &seq
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::ExtAbstractInterfaceDef,
-        CORBA::ExtAbstractInterfaceDef_var
+        ExtAbstractInterfaceDef,
+        ExtAbstractInterfaceDef_var
       >
     (seq)
 {}
@@ -1866,6 +2441,59 @@ void CORBA::ExtAbstractInterfaceDefSeq::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+namespace CORBA
+{
+  extern ::CORBA::TypeCode_ptr const _tc_ExtAbstractInterfaceDef;
+}
+
+
+#ifndef _TAO_TYPECODE_CORBA_ExtAbstractInterfaceDefSeq_GUARD
+#define _TAO_TYPECODE_CORBA_ExtAbstractInterfaceDefSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_ExtAbstractInterfaceDefSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::_tc_ExtAbstractInterfaceDef,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_CORBA_ExtAbstractInterfaceDefSeq_0 =
+      &CORBA_ExtAbstractInterfaceDefSeq_0;
+    
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_ExtAbstractInterfaceDefSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ExtAbstractInterfaceDefSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/ExtAbstractInterfaceDefSeq:1.0",
+    "ExtAbstractInterfaceDefSeq",
+    &TAO::TypeCode::tc_CORBA_ExtAbstractInterfaceDefSeq_0);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ExtAbstractInterfaceDefSeq =
+    &_tao_tc_CORBA_ExtAbstractInterfaceDefSeq;
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
@@ -1879,8 +2507,8 @@ CORBA::ExtLocalInterfaceDefSeq::ExtLocalInterfaceDefSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::ExtLocalInterfaceDef,
-        CORBA::ExtLocalInterfaceDef_var
+        ExtLocalInterfaceDef,
+        ExtLocalInterfaceDef_var
       >
     (max)
 {}
@@ -1892,8 +2520,8 @@ CORBA::ExtLocalInterfaceDefSeq::ExtLocalInterfaceDefSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::ExtLocalInterfaceDef,
-        CORBA::ExtLocalInterfaceDef_var
+        ExtLocalInterfaceDef,
+        ExtLocalInterfaceDef_var
       >
     (max, length, buffer, release)
 {}
@@ -1902,8 +2530,8 @@ CORBA::ExtLocalInterfaceDefSeq::ExtLocalInterfaceDefSeq (
     const ExtLocalInterfaceDefSeq &seq
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::ExtLocalInterfaceDef,
-        CORBA::ExtLocalInterfaceDef_var
+        ExtLocalInterfaceDef,
+        ExtLocalInterfaceDef_var
       >
     (seq)
 {}
@@ -1922,6 +2550,59 @@ void CORBA::ExtLocalInterfaceDefSeq::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+namespace CORBA
+{
+  extern ::CORBA::TypeCode_ptr const _tc_ExtLocalInterfaceDef;
+}
+
+
+#ifndef _TAO_TYPECODE_CORBA_ExtLocalInterfaceDefSeq_GUARD
+#define _TAO_TYPECODE_CORBA_ExtLocalInterfaceDefSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_ExtLocalInterfaceDefSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::_tc_ExtLocalInterfaceDef,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_CORBA_ExtLocalInterfaceDefSeq_0 =
+      &CORBA_ExtLocalInterfaceDefSeq_0;
+    
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_ExtLocalInterfaceDefSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ExtLocalInterfaceDefSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/ExtLocalInterfaceDefSeq:1.0",
+    "ExtLocalInterfaceDefSeq",
+    &TAO::TypeCode::tc_CORBA_ExtLocalInterfaceDefSeq_0);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ExtLocalInterfaceDefSeq =
+    &_tao_tc_CORBA_ExtLocalInterfaceDefSeq;
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
@@ -1935,8 +2616,8 @@ CORBA::ContainedSeq::ContainedSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::Contained,
-        CORBA::Contained_var
+        Contained,
+        Contained_var
       >
     (max)
 {}
@@ -1948,8 +2629,8 @@ CORBA::ContainedSeq::ContainedSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::Contained,
-        CORBA::Contained_var
+        Contained,
+        Contained_var
       >
     (max, length, buffer, release)
 {}
@@ -1958,8 +2639,8 @@ CORBA::ContainedSeq::ContainedSeq (
     const ContainedSeq &seq
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::Contained,
-        CORBA::Contained_var
+        Contained,
+        Contained_var
       >
     (seq)
 {}
@@ -1978,6 +2659,83 @@ void CORBA::ContainedSeq::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+#ifndef _TAO_TYPECODE_CORBA_ContainedSeq_GUARD
+#define _TAO_TYPECODE_CORBA_ContainedSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_ContainedSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::_tc_Contained,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_CORBA_ContainedSeq_0 =
+      &CORBA_ContainedSeq_0;
+    
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_ContainedSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ContainedSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/ContainedSeq:1.0",
+    "ContainedSeq",
+    &TAO::TypeCode::tc_CORBA_ContainedSeq_0);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ContainedSeq =
+    &_tao_tc_CORBA_ContainedSeq;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_StructMember[] =
+  {
+    { "name", &CORBA::_tc_Identifier },
+    { "type", &CORBA::_tc_TypeCode },
+    { "type_def", &CORBA::_tc_IDLType }
+    
+  };
+static TAO::TypeCode::Struct<char const *,
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_StructMember (
+    CORBA::tk_struct,
+    "IDL:omg.org/CORBA/StructMember:1.0",
+    "StructMember",
+    _tao_fields_CORBA_StructMember,
+    3);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_StructMember =
+    &_tao_tc_CORBA_StructMember;
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
@@ -2004,7 +2762,7 @@ CORBA::StructMemberSeq::StructMemberSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Sequence<
-        CORBA::StructMember
+        StructMember
       >
     (max)
 {}
@@ -2016,7 +2774,7 @@ CORBA::StructMemberSeq::StructMemberSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Sequence<
-        CORBA::StructMember
+        StructMember
       >
     (max, length, buffer, release)
 {}
@@ -2025,7 +2783,7 @@ CORBA::StructMemberSeq::StructMemberSeq (
     const StructMemberSeq &seq
   )
   : TAO_Unbounded_Sequence<
-        CORBA::StructMember
+        StructMember
       >
     (seq)
 {}
@@ -2044,6 +2802,87 @@ void CORBA::StructMemberSeq::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+#ifndef _TAO_TYPECODE_CORBA_StructMemberSeq_GUARD
+#define _TAO_TYPECODE_CORBA_StructMemberSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_StructMemberSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::_tc_StructMember,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_CORBA_StructMemberSeq_0 =
+      &CORBA_StructMemberSeq_0;
+    
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_StructMemberSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_StructMemberSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/StructMemberSeq:1.0",
+    "StructMemberSeq",
+    &TAO::TypeCode::tc_CORBA_StructMemberSeq_0);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_StructMemberSeq =
+    &_tao_tc_CORBA_StructMemberSeq;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_Initializer[] =
+  {
+    { "members", &CORBA::_tc_StructMemberSeq },
+    { "name", &CORBA::_tc_Identifier }
+    
+  };
+static TAO::TypeCode::Struct<char const *,
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_Initializer (
+    CORBA::tk_struct,
+    "IDL:omg.org/CORBA/Initializer:1.0",
+    "Initializer",
+    _tao_fields_CORBA_Initializer,
+    2);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_Initializer =
+    &_tao_tc_CORBA_Initializer;
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
@@ -2070,7 +2909,7 @@ CORBA::InitializerSeq::InitializerSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Sequence<
-        CORBA::Initializer
+        Initializer
       >
     (max)
 {}
@@ -2082,7 +2921,7 @@ CORBA::InitializerSeq::InitializerSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Sequence<
-        CORBA::Initializer
+        Initializer
       >
     (max, length, buffer, release)
 {}
@@ -2091,7 +2930,7 @@ CORBA::InitializerSeq::InitializerSeq (
     const InitializerSeq &seq
   )
   : TAO_Unbounded_Sequence<
-        CORBA::Initializer
+        Initializer
       >
     (seq)
 {}
@@ -2110,6 +2949,85 @@ void CORBA::InitializerSeq::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+#ifndef _TAO_TYPECODE_CORBA_InitializerSeq_GUARD
+#define _TAO_TYPECODE_CORBA_InitializerSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_InitializerSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::_tc_Initializer,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_CORBA_InitializerSeq_0 =
+      &CORBA_InitializerSeq_0;
+    
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_InitializerSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_InitializerSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/InitializerSeq:1.0",
+    "InitializerSeq",
+    &TAO::TypeCode::tc_CORBA_InitializerSeq_0);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_InitializerSeq =
+    &_tao_tc_CORBA_InitializerSeq;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ExceptionDescription[] =
+  {
+    { "name", &CORBA::_tc_Identifier },
+    { "id", &CORBA::_tc_RepositoryId },
+    { "defined_in", &CORBA::_tc_RepositoryId },
+    { "version", &CORBA::_tc_VersionSpec },
+    { "type", &CORBA::_tc_TypeCode }
+    
+  };
+static TAO::TypeCode::Struct<char const *,
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ExceptionDescription (
+    CORBA::tk_struct,
+    "IDL:omg.org/CORBA/ExceptionDescription:1.0",
+    "ExceptionDescription",
+    _tao_fields_CORBA_ExceptionDescription,
+    5);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ExceptionDescription =
+    &_tao_tc_CORBA_ExceptionDescription;
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
@@ -2136,7 +3054,7 @@ CORBA::ExcDescriptionSeq::ExcDescriptionSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ExceptionDescription
+        ExceptionDescription
       >
     (max)
 {}
@@ -2148,7 +3066,7 @@ CORBA::ExcDescriptionSeq::ExcDescriptionSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ExceptionDescription
+        ExceptionDescription
       >
     (max, length, buffer, release)
 {}
@@ -2157,7 +3075,7 @@ CORBA::ExcDescriptionSeq::ExcDescriptionSeq (
     const ExcDescriptionSeq &seq
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ExceptionDescription
+        ExceptionDescription
       >
     (seq)
 {}
@@ -2176,6 +3094,93 @@ void CORBA::ExcDescriptionSeq::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+#ifndef _TAO_TYPECODE_CORBA_ExcDescriptionSeq_GUARD
+#define _TAO_TYPECODE_CORBA_ExcDescriptionSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_ExcDescriptionSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::_tc_ExceptionDescription,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_CORBA_ExcDescriptionSeq_0 =
+      &CORBA_ExcDescriptionSeq_0;
+    
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_ExcDescriptionSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ExcDescriptionSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/ExcDescriptionSeq:1.0",
+    "ExcDescriptionSeq",
+    &TAO::TypeCode::tc_CORBA_ExcDescriptionSeq_0);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ExcDescriptionSeq =
+    &_tao_tc_CORBA_ExcDescriptionSeq;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ExtInitializer[] =
+  {
+    { "members", &CORBA::_tc_StructMemberSeq },
+    { "exceptions", &CORBA::_tc_ExcDescriptionSeq },
+    { "name", &CORBA::_tc_Identifier }
+    
+  };
+static TAO::TypeCode::Struct<char const *,
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ExtInitializer (
+    CORBA::tk_struct,
+    "IDL:omg.org/CORBA/ExtInitializer:1.0",
+    "ExtInitializer",
+    _tao_fields_CORBA_ExtInitializer,
+    3);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ExtInitializer =
+    &_tao_tc_CORBA_ExtInitializer;
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
@@ -2202,7 +3207,7 @@ CORBA::ExtInitializerSeq::ExtInitializerSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ExtInitializer
+        ExtInitializer
       >
     (max)
 {}
@@ -2214,7 +3219,7 @@ CORBA::ExtInitializerSeq::ExtInitializerSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ExtInitializer
+        ExtInitializer
       >
     (max, length, buffer, release)
 {}
@@ -2223,7 +3228,7 @@ CORBA::ExtInitializerSeq::ExtInitializerSeq (
     const ExtInitializerSeq &seq
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ExtInitializer
+        ExtInitializer
       >
     (seq)
 {}
@@ -2242,6 +3247,84 @@ void CORBA::ExtInitializerSeq::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+#ifndef _TAO_TYPECODE_CORBA_ExtInitializerSeq_GUARD
+#define _TAO_TYPECODE_CORBA_ExtInitializerSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_ExtInitializerSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::_tc_ExtInitializer,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_CORBA_ExtInitializerSeq_0 =
+      &CORBA_ExtInitializerSeq_0;
+    
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_ExtInitializerSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ExtInitializerSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/ExtInitializerSeq:1.0",
+    "ExtInitializerSeq",
+    &TAO::TypeCode::tc_CORBA_ExtInitializerSeq_0);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ExtInitializerSeq =
+    &_tao_tc_CORBA_ExtInitializerSeq;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_UnionMember[] =
+  {
+    { "name", &CORBA::_tc_Identifier },
+    { "label", &CORBA::_tc_any },
+    { "type", &CORBA::_tc_TypeCode },
+    { "type_def", &CORBA::_tc_IDLType }
+    
+  };
+static TAO::TypeCode::Struct<char const *,
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_UnionMember (
+    CORBA::tk_struct,
+    "IDL:omg.org/CORBA/UnionMember:1.0",
+    "UnionMember",
+    _tao_fields_CORBA_UnionMember,
+    4);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_UnionMember =
+    &_tao_tc_CORBA_UnionMember;
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
@@ -2268,7 +3351,7 @@ CORBA::UnionMemberSeq::UnionMemberSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Sequence<
-        CORBA::UnionMember
+        UnionMember
       >
     (max)
 {}
@@ -2280,7 +3363,7 @@ CORBA::UnionMemberSeq::UnionMemberSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Sequence<
-        CORBA::UnionMember
+        UnionMember
       >
     (max, length, buffer, release)
 {}
@@ -2289,7 +3372,7 @@ CORBA::UnionMemberSeq::UnionMemberSeq (
     const UnionMemberSeq &seq
   )
   : TAO_Unbounded_Sequence<
-        CORBA::UnionMember
+        UnionMember
       >
     (seq)
 {}
@@ -2308,6 +3391,54 @@ void CORBA::UnionMemberSeq::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+#ifndef _TAO_TYPECODE_CORBA_UnionMemberSeq_GUARD
+#define _TAO_TYPECODE_CORBA_UnionMemberSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_UnionMemberSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::_tc_UnionMember,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_CORBA_UnionMemberSeq_0 =
+      &CORBA_UnionMemberSeq_0;
+    
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_UnionMemberSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_UnionMemberSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/UnionMemberSeq:1.0",
+    "UnionMemberSeq",
+    &TAO::TypeCode::tc_CORBA_UnionMemberSeq_0);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_UnionMemberSeq =
+    &_tao_tc_CORBA_UnionMemberSeq;
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
@@ -2356,6 +3487,54 @@ void CORBA::EnumMemberSeq::_tao_any_destructor (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+#ifndef _TAO_TYPECODE_CORBA_EnumMemberSeq_GUARD
+#define _TAO_TYPECODE_CORBA_EnumMemberSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_EnumMemberSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::_tc_Identifier,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_CORBA_EnumMemberSeq_0 =
+      &CORBA_EnumMemberSeq_0;
+    
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_EnumMemberSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_EnumMemberSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/EnumMemberSeq:1.0",
+    "EnumMemberSeq",
+    &TAO::TypeCode::tc_CORBA_EnumMemberSeq_0);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_EnumMemberSeq =
+    &_tao_tc_CORBA_EnumMemberSeq;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::Container.
@@ -2418,8 +3597,8 @@ TAO::Collocation_Proxy_Broker *
       CORBA_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::Contained>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::ScopedName>::in_arg_val _tao_search_name (search_name);
+  TAO::Arg_Traits< ::CORBA::Contained>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::ScopedName>::in_arg_val _tao_search_name (search_name);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2464,8 +3643,8 @@ TAO::Collocation_Proxy_Broker *
       CORBA_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ContainedSeq>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::DefinitionKind>::in_arg_val _tao_limit_type (limit_type);
+  TAO::Arg_Traits< ::CORBA::ContainedSeq>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::DefinitionKind>::in_arg_val _tao_limit_type (limit_type);
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_exclude_inherited (exclude_inherited);
   
   TAO::Argument *_the_tao_operation_signature [] =
@@ -2514,10 +3693,10 @@ TAO::Collocation_Proxy_Broker *
       CORBA_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ContainedSeq>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_search_name (search_name);
+  TAO::Arg_Traits< ::CORBA::ContainedSeq>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_search_name (search_name);
   TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_levels_to_search (levels_to_search);
-  TAO::Arg_Traits< CORBA::DefinitionKind>::in_arg_val _tao_limit_type (limit_type);
+  TAO::Arg_Traits< ::CORBA::DefinitionKind>::in_arg_val _tao_limit_type (limit_type);
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_exclude_inherited (exclude_inherited);
   
   TAO::Argument *_the_tao_operation_signature [] =
@@ -2544,6 +3723,30 @@ TAO::Collocation_Proxy_Broker *
   return _tao_retval.retn ();
 }
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_Container_Description[] =
+  {
+    { "contained_object", &CORBA::_tc_Contained },
+    { "kind", &CORBA::_tc_DefinitionKind },
+    { "value", &CORBA::_tc_any }
+    
+  };
+static TAO::TypeCode::Struct<char const *,
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_Container_Description (
+    CORBA::tk_struct,
+    "IDL:omg.org/CORBA/Container/Description:1.0",
+    "Description",
+    _tao_fields_CORBA_Container_Description,
+    3);
+  
+::CORBA::TypeCode_ptr const CORBA::Container::_tc_Description =
+  &_tao_tc_CORBA_Container_Description;
+
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
@@ -2570,7 +3773,7 @@ CORBA::Container::DescriptionSeq::DescriptionSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Sequence<
-        CORBA::Container::Description
+        Description
       >
     (max)
 {}
@@ -2582,7 +3785,7 @@ CORBA::Container::DescriptionSeq::DescriptionSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Sequence<
-        CORBA::Container::Description
+        Description
       >
     (max, length, buffer, release)
 {}
@@ -2591,7 +3794,7 @@ CORBA::Container::DescriptionSeq::DescriptionSeq (
     const DescriptionSeq &seq
   )
   : TAO_Unbounded_Sequence<
-        CORBA::Container::Description
+        Description
       >
     (seq)
 {}
@@ -2611,6 +3814,49 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+#ifndef _TAO_TYPECODE_CORBA_Container_DescriptionSeq_GUARD
+#define _TAO_TYPECODE_CORBA_Container_DescriptionSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_Container_DescriptionSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::Container::_tc_Description,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_CORBA_Container_DescriptionSeq_0 =
+      &CORBA_Container_DescriptionSeq_0;
+    
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_Container_DescriptionSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_Container_DescriptionSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/Container/DescriptionSeq:1.0",
+    "DescriptionSeq",
+    &TAO::TypeCode::tc_CORBA_Container_DescriptionSeq_0);
+  
+::CORBA::TypeCode_ptr const CORBA::Container::_tc_DescriptionSeq =
+  &_tao_tc_CORBA_Container_DescriptionSeq;
+
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_cs.cpp:78
 
 ::CORBA::Container::DescriptionSeq * CORBA::Container::describe_contents (
@@ -2633,8 +3879,8 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
       CORBA_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::Container::DescriptionSeq>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::DefinitionKind>::in_arg_val _tao_limit_type (limit_type);
+  TAO::Arg_Traits< ::CORBA::Container::DescriptionSeq>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::DefinitionKind>::in_arg_val _tao_limit_type (limit_type);
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_exclude_inherited (exclude_inherited);
   TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_max_returned_objs (max_returned_objs);
   
@@ -2684,10 +3930,10 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
       CORBA_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ModuleDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::ModuleDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2737,11 +3983,11 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
       CORBA_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ConstantDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_type (type);
+  TAO::Arg_Traits< ::CORBA::ConstantDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type (type);
   TAO::Arg_Traits< ::CORBA::Any>::in_arg_val _tao_value (value);
   
   TAO::Argument *_the_tao_operation_signature [] =
@@ -2793,11 +4039,11 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
       CORBA_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::StructDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::StructMemberSeq>::in_arg_val _tao_members (members);
+  TAO::Arg_Traits< ::CORBA::StructDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::StructMemberSeq>::in_arg_val _tao_members (members);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2848,12 +4094,12 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
       CORBA_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::UnionDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_discriminator_type (discriminator_type);
-  TAO::Arg_Traits< CORBA::UnionMemberSeq>::in_arg_val _tao_members (members);
+  TAO::Arg_Traits< ::CORBA::UnionDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_discriminator_type (discriminator_type);
+  TAO::Arg_Traits< ::CORBA::UnionMemberSeq>::in_arg_val _tao_members (members);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2904,11 +4150,11 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
       CORBA_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::EnumDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::EnumMemberSeq>::in_arg_val _tao_members (members);
+  TAO::Arg_Traits< ::CORBA::EnumDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::EnumMemberSeq>::in_arg_val _tao_members (members);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2958,11 +4204,11 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
       CORBA_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::AliasDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_original_type (original_type);
+  TAO::Arg_Traits< ::CORBA::AliasDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_original_type (original_type);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -3012,11 +4258,11 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
       CORBA_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::InterfaceDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::in_arg_val _tao_base_interfaces (base_interfaces);
+  TAO::Arg_Traits< ::CORBA::InterfaceDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_base_interfaces (base_interfaces);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -3072,17 +4318,17 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
       CORBA_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ValueDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::ValueDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_custom (is_custom);
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_abstract (is_abstract);
-  TAO::Arg_Traits< CORBA::ValueDef>::in_arg_val _tao_base_value (base_value);
+  TAO::Arg_Traits< ::CORBA::ValueDef>::in_arg_val _tao_base_value (base_value);
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_truncatable (is_truncatable);
-  TAO::Arg_Traits< CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values (abstract_base_values);
-  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces (supported_interfaces);
-  TAO::Arg_Traits< CORBA::InitializerSeq>::in_arg_val _tao_initializers (initializers);
+  TAO::Arg_Traits< ::CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values (abstract_base_values);
+  TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces (supported_interfaces);
+  TAO::Arg_Traits< ::CORBA::InitializerSeq>::in_arg_val _tao_initializers (initializers);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -3138,11 +4384,11 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
       CORBA_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ValueBoxDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_original_type_def (original_type_def);
+  TAO::Arg_Traits< ::CORBA::ValueBoxDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_original_type_def (original_type_def);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -3192,11 +4438,11 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
       CORBA_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ExceptionDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::StructMemberSeq>::in_arg_val _tao_members (members);
+  TAO::Arg_Traits< ::CORBA::ExceptionDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::StructMemberSeq>::in_arg_val _tao_members (members);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -3245,10 +4491,10 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
       CORBA_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::NativeDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::NativeDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -3297,11 +4543,11 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
       CORBA_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::AbstractInterfaceDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::AbstractInterfaceDefSeq>::in_arg_val _tao_base_interfaces (base_interfaces);
+  TAO::Arg_Traits< ::CORBA::AbstractInterfaceDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::AbstractInterfaceDefSeq>::in_arg_val _tao_base_interfaces (base_interfaces);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -3351,11 +4597,11 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
       CORBA_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::LocalInterfaceDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::in_arg_val _tao_base_interfaces (base_interfaces);
+  TAO::Arg_Traits< ::CORBA::LocalInterfaceDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_base_interfaces (base_interfaces);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -3411,17 +4657,17 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
       CORBA_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ExtValueDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::ExtValueDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_custom (is_custom);
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_abstract (is_abstract);
-  TAO::Arg_Traits< CORBA::ValueDef>::in_arg_val _tao_base_value (base_value);
+  TAO::Arg_Traits< ::CORBA::ValueDef>::in_arg_val _tao_base_value (base_value);
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_truncatable (is_truncatable);
-  TAO::Arg_Traits< CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values (abstract_base_values);
-  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces (supported_interfaces);
-  TAO::Arg_Traits< CORBA::ExtInitializerSeq>::in_arg_val _tao_initializers (initializers);
+  TAO::Arg_Traits< ::CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values (abstract_base_values);
+  TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces (supported_interfaces);
+  TAO::Arg_Traits< ::CORBA::ExtInitializerSeq>::in_arg_val _tao_initializers (initializers);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -3573,6 +4819,24 @@ CORBA::Container::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_Container (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/Container:1.0",
+    "Container");
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_Container =
+    &_tao_tc_CORBA_Container;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::IDLType.
@@ -3776,6 +5040,24 @@ CORBA::IDLType::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_IDLType (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/IDLType:1.0",
+    "IDLType");
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_IDLType =
+    &_tao_tc_CORBA_IDLType;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::TypedefDef.
@@ -3945,6 +5227,55 @@ CORBA::TypedefDef::marshal (TAO_OutputCDR &cdr)
   return (cdr << this);
 }
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_TypedefDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/TypedefDef:1.0",
+    "TypedefDef");
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_TypedefDef =
+    &_tao_tc_CORBA_TypedefDef;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_TypeDescription[] =
+  {
+    { "name", &CORBA::_tc_Identifier },
+    { "id", &CORBA::_tc_RepositoryId },
+    { "defined_in", &CORBA::_tc_RepositoryId },
+    { "version", &CORBA::_tc_VersionSpec },
+    { "type", &CORBA::_tc_TypeCode }
+    
+  };
+static TAO::TypeCode::Struct<char const *,
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_TypeDescription (
+    CORBA::tk_struct,
+    "IDL:omg.org/CORBA/TypeDescription:1.0",
+    "TypeDescription",
+    _tao_fields_CORBA_TypeDescription,
+    5);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_TypeDescription =
+    &_tao_tc_CORBA_TypeDescription;
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
@@ -3959,6 +5290,1732 @@ CORBA::TypeDescription::_tao_any_destructor (
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_enum/any_op_cs.cpp:52
+
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::DefinitionKind _tao_elem
+  )
+{
+  TAO::Any_Basic_Impl_T<CORBA::DefinitionKind>::insert (
+      _tao_any,
+      CORBA::_tc_DefinitionKind,
+      _tao_elem
+    );
+}
+
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::DefinitionKind &_tao_elem
+  )
+{
+  return
+    TAO::Any_Basic_Impl_T<CORBA::DefinitionKind>::extract (
+        _tao_any,
+        CORBA::_tc_DefinitionKind,
+        _tao_elem 
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::IRObject>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::IRObject_ptr _tao_elem
+  )
+{
+  CORBA::IRObject_ptr _tao_objptr =
+    CORBA::IRObject::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::IRObject_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::IRObject>::insert (
+      _tao_any,
+      CORBA::IRObject::_tao_any_destructor,
+      CORBA::_tc_IRObject,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::IRObject_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::IRObject>::extract (
+        _tao_any,
+        CORBA::IRObject::_tao_any_destructor,
+        CORBA::_tc_IRObject,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::Contained>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::Contained_ptr _tao_elem
+  )
+{
+  CORBA::Contained_ptr _tao_objptr =
+    CORBA::Contained::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::Contained_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::Contained>::insert (
+      _tao_any,
+      CORBA::Contained::_tao_any_destructor,
+      CORBA::_tc_Contained,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::Contained_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::Contained>::extract (
+        _tao_any,
+        CORBA::Contained::_tao_any_destructor,
+        CORBA::_tc_Contained,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::Contained::Description &_tao_elem
+  )
+{
+  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.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::Contained::Description *_tao_elem
+  )
+{
+  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).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::Contained::Description *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::Contained::Description *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::Contained::Description *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::Contained::Description>::extract (
+        _tao_any,
+        CORBA::Contained::Description::_tao_any_destructor,
+        CORBA::Contained::_tc_Description,
+        _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::InterfaceDefSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::InterfaceDefSeq>::insert_copy (
+      _tao_any,
+      CORBA::InterfaceDefSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_InterfaceDefSeq_0,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::InterfaceDefSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::InterfaceDefSeq>::insert (
+      _tao_any,
+      CORBA::InterfaceDefSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_InterfaceDefSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::InterfaceDefSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::InterfaceDefSeq *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::InterfaceDefSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::InterfaceDefSeq>::extract (
+        _tao_any,
+        CORBA::InterfaceDefSeq::_tao_any_destructor,
+        TAO::TypeCode::tc_CORBA_InterfaceDefSeq_0,
+        _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::ValueDefSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ValueDefSeq>::insert_copy (
+      _tao_any,
+      CORBA::ValueDefSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ValueDefSeq_0,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ValueDefSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ValueDefSeq>::insert (
+      _tao_any,
+      CORBA::ValueDefSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ValueDefSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ValueDefSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::ValueDefSeq *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ValueDefSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ValueDefSeq>::extract (
+        _tao_any,
+        CORBA::ValueDefSeq::_tao_any_destructor,
+        TAO::TypeCode::tc_CORBA_ValueDefSeq_0,
+        _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::AbstractInterfaceDefSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::AbstractInterfaceDefSeq>::insert_copy (
+      _tao_any,
+      CORBA::AbstractInterfaceDefSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_AbstractInterfaceDefSeq_0,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::AbstractInterfaceDefSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::AbstractInterfaceDefSeq>::insert (
+      _tao_any,
+      CORBA::AbstractInterfaceDefSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_AbstractInterfaceDefSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::AbstractInterfaceDefSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::AbstractInterfaceDefSeq *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::AbstractInterfaceDefSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::AbstractInterfaceDefSeq>::extract (
+        _tao_any,
+        CORBA::AbstractInterfaceDefSeq::_tao_any_destructor,
+        TAO::TypeCode::tc_CORBA_AbstractInterfaceDefSeq_0,
+        _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::LocalInterfaceDefSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::LocalInterfaceDefSeq>::insert_copy (
+      _tao_any,
+      CORBA::LocalInterfaceDefSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_LocalInterfaceDefSeq_0,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::LocalInterfaceDefSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::LocalInterfaceDefSeq>::insert (
+      _tao_any,
+      CORBA::LocalInterfaceDefSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_LocalInterfaceDefSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::LocalInterfaceDefSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::LocalInterfaceDefSeq *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::LocalInterfaceDefSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::LocalInterfaceDefSeq>::extract (
+        _tao_any,
+        CORBA::LocalInterfaceDefSeq::_tao_any_destructor,
+        TAO::TypeCode::tc_CORBA_LocalInterfaceDefSeq_0,
+        _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::ExtInterfaceDefSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ExtInterfaceDefSeq>::insert_copy (
+      _tao_any,
+      CORBA::ExtInterfaceDefSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ExtInterfaceDefSeq_0,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ExtInterfaceDefSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ExtInterfaceDefSeq>::insert (
+      _tao_any,
+      CORBA::ExtInterfaceDefSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ExtInterfaceDefSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ExtInterfaceDefSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::ExtInterfaceDefSeq *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ExtInterfaceDefSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ExtInterfaceDefSeq>::extract (
+        _tao_any,
+        CORBA::ExtInterfaceDefSeq::_tao_any_destructor,
+        TAO::TypeCode::tc_CORBA_ExtInterfaceDefSeq_0,
+        _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::ExtValueDefSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ExtValueDefSeq>::insert_copy (
+      _tao_any,
+      CORBA::ExtValueDefSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ExtValueDefSeq_0,
+      _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,
+      TAO::TypeCode::tc_CORBA_ExtValueDefSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ExtValueDefSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= 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,
+        TAO::TypeCode::tc_CORBA_ExtValueDefSeq_0,
+        _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::ExtAbstractInterfaceDefSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ExtAbstractInterfaceDefSeq>::insert_copy (
+      _tao_any,
+      CORBA::ExtAbstractInterfaceDefSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ExtAbstractInterfaceDefSeq_0,
+      _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,
+      TAO::TypeCode::tc_CORBA_ExtAbstractInterfaceDefSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ExtAbstractInterfaceDefSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= 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,
+        TAO::TypeCode::tc_CORBA_ExtAbstractInterfaceDefSeq_0,
+        _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::ExtLocalInterfaceDefSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ExtLocalInterfaceDefSeq>::insert_copy (
+      _tao_any,
+      CORBA::ExtLocalInterfaceDefSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ExtLocalInterfaceDefSeq_0,
+      _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,
+      TAO::TypeCode::tc_CORBA_ExtLocalInterfaceDefSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ExtLocalInterfaceDefSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= 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,
+        TAO::TypeCode::tc_CORBA_ExtLocalInterfaceDefSeq_0,
+        _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::ContainedSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ContainedSeq>::insert_copy (
+      _tao_any,
+      CORBA::ContainedSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ContainedSeq_0,
+      _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,
+      TAO::TypeCode::tc_CORBA_ContainedSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ContainedSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= 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,
+        TAO::TypeCode::tc_CORBA_ContainedSeq_0,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::StructMember &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::StructMember>::insert_copy (
+      _tao_any,
+      CORBA::StructMember::_tao_any_destructor,
+      CORBA::_tc_StructMember,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::StructMember *_tao_elem
+  )
+{
+  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).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::StructMember *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::StructMember *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::StructMember *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::StructMember>::extract (
+        _tao_any,
+        CORBA::StructMember::_tao_any_destructor,
+        CORBA::_tc_StructMember,
+        _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::StructMemberSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::StructMemberSeq>::insert_copy (
+      _tao_any,
+      CORBA::StructMemberSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_StructMemberSeq_0,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::StructMemberSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::StructMemberSeq>::insert (
+      _tao_any,
+      CORBA::StructMemberSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_StructMemberSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::StructMemberSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::StructMemberSeq *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::StructMemberSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::StructMemberSeq>::extract (
+        _tao_any,
+        CORBA::StructMemberSeq::_tao_any_destructor,
+        TAO::TypeCode::tc_CORBA_StructMemberSeq_0,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::Initializer &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::Initializer>::insert_copy (
+      _tao_any,
+      CORBA::Initializer::_tao_any_destructor,
+      CORBA::_tc_Initializer,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::Initializer *_tao_elem
+  )
+{
+  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).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::Initializer *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::Initializer *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::Initializer *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::Initializer>::extract (
+        _tao_any,
+        CORBA::Initializer::_tao_any_destructor,
+        CORBA::_tc_Initializer,
+        _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::InitializerSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::InitializerSeq>::insert_copy (
+      _tao_any,
+      CORBA::InitializerSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_InitializerSeq_0,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::InitializerSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::InitializerSeq>::insert (
+      _tao_any,
+      CORBA::InitializerSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_InitializerSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::InitializerSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::InitializerSeq *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::InitializerSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::InitializerSeq>::extract (
+        _tao_any,
+        CORBA::InitializerSeq::_tao_any_destructor,
+        TAO::TypeCode::tc_CORBA_InitializerSeq_0,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// 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 >>= 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
+      );
+}
+
+// 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::Any_Dual_Impl_T<CORBA::ExcDescriptionSeq>::insert_copy (
+      _tao_any,
+      CORBA::ExcDescriptionSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ExcDescriptionSeq_0,
+      _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,
+      TAO::TypeCode::tc_CORBA_ExcDescriptionSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ExcDescriptionSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= 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,
+        TAO::TypeCode::tc_CORBA_ExcDescriptionSeq_0,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// 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 >>= 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
+      );
+}
+
+// TAO_IDL - Generated from 
+// 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,
+      TAO::TypeCode::tc_CORBA_ExtInitializerSeq_0,
+      _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,
+      TAO::TypeCode::tc_CORBA_ExtInitializerSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ExtInitializerSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= 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,
+        TAO::TypeCode::tc_CORBA_ExtInitializerSeq_0,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::UnionMember &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::UnionMember>::insert_copy (
+      _tao_any,
+      CORBA::UnionMember::_tao_any_destructor,
+      CORBA::_tc_UnionMember,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::UnionMember *_tao_elem
+  )
+{
+  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).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::UnionMember *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::UnionMember *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::UnionMember *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::UnionMember>::extract (
+        _tao_any,
+        CORBA::UnionMember::_tao_any_destructor,
+        CORBA::_tc_UnionMember,
+        _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::UnionMemberSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::UnionMemberSeq>::insert_copy (
+      _tao_any,
+      CORBA::UnionMemberSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_UnionMemberSeq_0,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::UnionMemberSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::UnionMemberSeq>::insert (
+      _tao_any,
+      CORBA::UnionMemberSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_UnionMemberSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::UnionMemberSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::UnionMemberSeq *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::UnionMemberSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::UnionMemberSeq>::extract (
+        _tao_any,
+        CORBA::UnionMemberSeq::_tao_any_destructor,
+        TAO::TypeCode::tc_CORBA_UnionMemberSeq_0,
+        _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::EnumMemberSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::EnumMemberSeq>::insert_copy (
+      _tao_any,
+      CORBA::EnumMemberSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_EnumMemberSeq_0,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::EnumMemberSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::EnumMemberSeq>::insert (
+      _tao_any,
+      CORBA::EnumMemberSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_EnumMemberSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::EnumMemberSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::EnumMemberSeq *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::EnumMemberSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::EnumMemberSeq>::extract (
+        _tao_any,
+        CORBA::EnumMemberSeq::_tao_any_destructor,
+        TAO::TypeCode::tc_CORBA_EnumMemberSeq_0,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::Container>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::Container_ptr _tao_elem
+  )
+{
+  CORBA::Container_ptr _tao_objptr =
+    CORBA::Container::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::Container_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::Container>::insert (
+      _tao_any,
+      CORBA::Container::_tao_any_destructor,
+      CORBA::_tc_Container,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::Container_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::Container>::extract (
+        _tao_any,
+        CORBA::Container::_tao_any_destructor,
+        CORBA::_tc_Container,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::Container::Description &_tao_elem
+  )
+{
+  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.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::Container::Description *_tao_elem
+  )
+{
+  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).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::Container::Description *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::Container::Description *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::Container::Description *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::Container::Description>::extract (
+        _tao_any,
+        CORBA::Container::Description::_tao_any_destructor,
+        CORBA::Container::_tc_Description,
+        _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::Container::DescriptionSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::Container::DescriptionSeq>::insert_copy (
+      _tao_any,
+      CORBA::Container::DescriptionSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_Container_DescriptionSeq_0,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::Container::DescriptionSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::Container::DescriptionSeq>::insert (
+      _tao_any,
+      CORBA::Container::DescriptionSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_Container_DescriptionSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::Container::DescriptionSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::Container::DescriptionSeq *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::Container::DescriptionSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::Container::DescriptionSeq>::extract (
+        _tao_any,
+        CORBA::Container::DescriptionSeq::_tao_any_destructor,
+        TAO::TypeCode::tc_CORBA_Container_DescriptionSeq_0,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::IDLType>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::IDLType_ptr _tao_elem
+  )
+{
+  CORBA::IDLType_ptr _tao_objptr =
+    CORBA::IDLType::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::IDLType_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::IDLType>::insert (
+      _tao_any,
+      CORBA::IDLType::_tao_any_destructor,
+      CORBA::_tc_IDLType,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::IDLType_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::IDLType>::extract (
+        _tao_any,
+        CORBA::IDLType::_tao_any_destructor,
+        CORBA::_tc_IDLType,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::TypedefDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::TypedefDef_ptr _tao_elem
+  )
+{
+  CORBA::TypedefDef_ptr _tao_objptr =
+    CORBA::TypedefDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::TypedefDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::TypedefDef>::insert (
+      _tao_any,
+      CORBA::TypedefDef::_tao_any_destructor,
+      CORBA::_tc_TypedefDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::TypedefDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::TypedefDef>::extract (
+        _tao_any,
+        CORBA::TypedefDef::_tao_any_destructor,
+        CORBA::_tc_TypedefDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::TypeDescription &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::TypeDescription>::insert_copy (
+      _tao_any,
+      CORBA::TypeDescription::_tao_any_destructor,
+      CORBA::_tc_TypeDescription,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::TypeDescription *_tao_elem
+  )
+{
+  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).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::TypeDescription *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::TypeDescription *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::TypeDescription *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::TypeDescription>::extract (
+        _tao_any,
+        CORBA::TypeDescription::_tao_any_destructor,
+        CORBA::_tc_TypeDescription,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
 // be\be_visitor_enum/cdr_op_cs.cpp:51
 
 CORBA::Boolean operator<< (TAO_OutputCDR & strm, CORBA::DefinitionKind _tao_enumerator)
diff --git a/TAO/tao/IFR_Client/IFR_BaseC.h b/TAO/tao/IFR_Client/IFR_BaseC.h
index 2b8edf46575..83817c8af4f 100644
--- a/TAO/tao/IFR_Client/IFR_BaseC.h
+++ b/TAO/tao/IFR_Client/IFR_BaseC.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
 #ifndef _TAO_IDL_ORIG_IFR_BASEC_H_
 #define _TAO_IDL_ORIG_IFR_BASEC_H_
@@ -45,9 +45,10 @@
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
-#include "tao/TypeCode.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Any.h"
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/Sequence_T.h"
 #include "tao/Objref_VarOut_T.h"
 #include "tao/Seq_Var_T.h"
@@ -71,7 +72,7 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_root/root_ch.cpp:62
 
 namespace TAO
@@ -85,22 +86,22 @@ namespace TAO
 
 namespace CORBA
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:413
-  
+
   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
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ScopedName;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_enum/enum_ch.cpp:57
-  
+
   enum DefinitionKind
   {
     dk_none,
@@ -140,29 +141,29 @@ namespace CORBA
     dk_Uses,
     dk_Event
   };
-  
+
   typedef DefinitionKind &DefinitionKind_out;
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_DefinitionKind;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_IROBJECT__VAR_OUT_CH_)
 #define _CORBA_IROBJECT__VAR_OUT_CH_
-  
+
   class IRObject;
   typedef IRObject *IRObject_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         IRObject
       >
     IRObject_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         IRObject
@@ -170,13 +171,13 @@ namespace CORBA
     IRObject_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_IROBJECT_CH_)
 #define _CORBA_IROBJECT_CH_
-  
+
   class TAO_IFR_Client_Export IRObject
     : public virtual CORBA::Object
   {
@@ -184,76 +185,76 @@ namespace CORBA
     friend class TAO::Narrow_Utils<IRObject>;
     typedef IRObject_ptr _ptr_type;
     typedef IRObject_var _var_type;
-    
+
     // The static operations.
     static IRObject_ptr _duplicate (IRObject_ptr obj);
-    
+
     static void _tao_release (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 static_cast<IRObject_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // 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
-    
+
     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:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_IRObject_Proxy_Broker_;
-  
+
   protected:
     // Concrete interface only.
     IRObject (void);
-    
+
     // 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 (void);
-    
+
     // Concrete non-local interface only.
     IRObject (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     // Non-local interface only.
     IRObject (
         TAO_Stub *objref,
@@ -261,50 +262,50 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     virtual ~IRObject (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     IRObject (const IRObject &);
-    
+
     void operator= (const IRObject &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_IRObject;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:413
-  
+
   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
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_VersionSpec;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_CONTAINED__VAR_OUT_CH_)
 #define _CORBA_CONTAINED__VAR_OUT_CH_
-  
+
   class Contained;
   typedef Contained *Contained_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         Contained
       >
     Contained_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         Contained
@@ -312,22 +313,22 @@ namespace CORBA
     Contained_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_REPOSITORY__VAR_OUT_CH_)
 #define _CORBA_REPOSITORY__VAR_OUT_CH_
-  
+
   class Repository;
   typedef Repository *Repository_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         Repository
       >
     Repository_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         Repository
@@ -335,22 +336,22 @@ namespace CORBA
     Repository_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_CONTAINER__VAR_OUT_CH_)
 #define _CORBA_CONTAINER__VAR_OUT_CH_
-  
+
   class Container;
   typedef Container *Container_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         Container
       >
     Container_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         Container
@@ -358,13 +359,13 @@ namespace CORBA
     Container_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_CONTAINED_CH_)
 #define _CORBA_CONTAINED_CH_
-  
+
   class TAO_IFR_Client_Export Contained
     : public virtual ::CORBA::IRObject
   {
@@ -372,42 +373,42 @@ namespace CORBA
     friend class TAO::Narrow_Utils<Contained>;
     typedef Contained_ptr _ptr_type;
     typedef Contained_var _var_type;
-    
+
     // The static operations.
     static Contained_ptr _duplicate (Contained_ptr obj);
-    
+
     static void _tao_release (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 static_cast<Contained_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // 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
-    
+
     virtual void id (
         const char * id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -415,20 +416,20 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // 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
-    
+
     virtual void name (
         const char * name
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -436,20 +437,20 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // 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
-    
+
     virtual void version (
         const char * version
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -457,85 +458,85 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // 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
-    
+
     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
-    
+
     virtual ::CORBA::Repository_ptr containing_repository (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_type.cpp:258
-    
+
     struct Description;
-    
+
     typedef
       TAO_Var_Var_T<
           Description
         >
       Description_var;
-    
+
     typedef
       TAO_Out_T<
           Description,
           Description_var
         >
       Description_out;
-    
+
     // TAO_IDL - Generated from
-    // be\be_visitor_structure/structure_ch.cpp:52
-    
+    // be\be_visitor_structure/structure_ch.cpp:57
+
     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_visitor_typecode/typecode_decl.cpp:44
-    
+    // be\be_visitor_typecode/typecode_decl.cpp:49
+
     static ::CORBA::TypeCode_ptr const _tc_Description;
-    
+
     // TAO_IDL - Generated from
     // 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
-    
+
     virtual void move (
         ::CORBA::Container_ptr new_container,
         const char * new_name,
@@ -545,34 +546,34 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_Contained_Proxy_Broker_;
-  
+
   protected:
     // Concrete interface only.
     Contained (void);
-    
+
     // 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 (void);
-    
+
     // Concrete non-local interface only.
     Contained (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     // Non-local interface only.
     Contained (
         TAO_Stub *objref,
@@ -580,38 +581,38 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     virtual ~Contained (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     Contained (const Contained &);
-    
+
     void operator= (const Contained &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_Contained;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_MODULEDEF__VAR_OUT_CH_)
 #define _CORBA_MODULEDEF__VAR_OUT_CH_
-  
+
   class ModuleDef;
   typedef ModuleDef *ModuleDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ModuleDef
       >
     ModuleDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ModuleDef
@@ -619,22 +620,22 @@ namespace CORBA
     ModuleDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_CONSTANTDEF__VAR_OUT_CH_)
 #define _CORBA_CONSTANTDEF__VAR_OUT_CH_
-  
+
   class ConstantDef;
   typedef ConstantDef *ConstantDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ConstantDef
       >
     ConstantDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ConstantDef
@@ -642,22 +643,22 @@ namespace CORBA
     ConstantDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_IDLTYPE__VAR_OUT_CH_)
 #define _CORBA_IDLTYPE__VAR_OUT_CH_
-  
+
   class IDLType;
   typedef IDLType *IDLType_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         IDLType
       >
     IDLType_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         IDLType
@@ -665,22 +666,22 @@ namespace CORBA
     IDLType_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_STRUCTDEF__VAR_OUT_CH_)
 #define _CORBA_STRUCTDEF__VAR_OUT_CH_
-  
+
   class StructDef;
   typedef StructDef *StructDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         StructDef
       >
     StructDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         StructDef
@@ -688,22 +689,22 @@ namespace CORBA
     StructDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_UNIONDEF__VAR_OUT_CH_)
 #define _CORBA_UNIONDEF__VAR_OUT_CH_
-  
+
   class UnionDef;
   typedef UnionDef *UnionDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         UnionDef
       >
     UnionDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         UnionDef
@@ -711,22 +712,22 @@ namespace CORBA
     UnionDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_ENUMDEF__VAR_OUT_CH_)
 #define _CORBA_ENUMDEF__VAR_OUT_CH_
-  
+
   class EnumDef;
   typedef EnumDef *EnumDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         EnumDef
       >
     EnumDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         EnumDef
@@ -734,22 +735,22 @@ namespace CORBA
     EnumDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_ALIASDEF__VAR_OUT_CH_)
 #define _CORBA_ALIASDEF__VAR_OUT_CH_
-  
+
   class AliasDef;
   typedef AliasDef *AliasDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         AliasDef
       >
     AliasDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         AliasDef
@@ -757,22 +758,22 @@ namespace CORBA
     AliasDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_INTERFACEDEF__VAR_OUT_CH_)
 #define _CORBA_INTERFACEDEF__VAR_OUT_CH_
-  
+
   class InterfaceDef;
   typedef InterfaceDef *InterfaceDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         InterfaceDef
       >
     InterfaceDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         InterfaceDef
@@ -780,15 +781,15 @@ namespace CORBA
     InterfaceDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_INTERFACEDEFSEQ_CH_)
 #define _CORBA_INTERFACEDEFSEQ_CH_
-  
+
   class InterfaceDefSeq;
-  
+
   typedef
     TAO_MngSeq_Var_T<
         InterfaceDefSeq,
@@ -798,7 +799,7 @@ namespace CORBA
           >
       >
     InterfaceDefSeq_var;
-  
+
   typedef
     TAO_MngSeq_Out_T<
         InterfaceDefSeq,
@@ -809,7 +810,7 @@ namespace CORBA
           >
       >
     InterfaceDefSeq_out;
-  
+
   class TAO_IFR_Client_Export InterfaceDefSeq
     : public
         TAO_Unbounded_Object_Sequence<
@@ -823,39 +824,39 @@ namespace CORBA
     InterfaceDefSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        InterfaceDef_ptr* buffer, 
+        InterfaceDef_ptr* buffer,
         CORBA::Boolean release = 0
       );
     InterfaceDefSeq (const InterfaceDefSeq &);
     ~InterfaceDefSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef InterfaceDefSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_InterfaceDefSeq;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_EXCEPTIONDEF__VAR_OUT_CH_)
 #define _CORBA_EXCEPTIONDEF__VAR_OUT_CH_
-  
+
   class ExceptionDef;
   typedef ExceptionDef *ExceptionDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ExceptionDef
       >
     ExceptionDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ExceptionDef
@@ -863,22 +864,22 @@ namespace CORBA
     ExceptionDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_NATIVEDEF__VAR_OUT_CH_)
 #define _CORBA_NATIVEDEF__VAR_OUT_CH_
-  
+
   class NativeDef;
   typedef NativeDef *NativeDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         NativeDef
       >
     NativeDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         NativeDef
@@ -886,22 +887,22 @@ namespace CORBA
     NativeDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_VALUEDEF__VAR_OUT_CH_)
 #define _CORBA_VALUEDEF__VAR_OUT_CH_
-  
+
   class ValueDef;
   typedef ValueDef *ValueDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ValueDef
       >
     ValueDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ValueDef
@@ -909,15 +910,15 @@ namespace CORBA
     ValueDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_VALUEDEFSEQ_CH_)
 #define _CORBA_VALUEDEFSEQ_CH_
-  
+
   class ValueDefSeq;
-  
+
   typedef
     TAO_MngSeq_Var_T<
         ValueDefSeq,
@@ -927,7 +928,7 @@ namespace CORBA
           >
       >
     ValueDefSeq_var;
-  
+
   typedef
     TAO_MngSeq_Out_T<
         ValueDefSeq,
@@ -938,7 +939,7 @@ namespace CORBA
           >
       >
     ValueDefSeq_out;
-  
+
   class TAO_IFR_Client_Export ValueDefSeq
     : public
         TAO_Unbounded_Object_Sequence<
@@ -952,39 +953,39 @@ namespace CORBA
     ValueDefSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        ValueDef_ptr* buffer, 
+        ValueDef_ptr* buffer,
         CORBA::Boolean release = 0
       );
     ValueDefSeq (const ValueDefSeq &);
     ~ValueDefSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef ValueDefSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ValueDefSeq;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_VALUEBOXDEF__VAR_OUT_CH_)
 #define _CORBA_VALUEBOXDEF__VAR_OUT_CH_
-  
+
   class ValueBoxDef;
   typedef ValueBoxDef *ValueBoxDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ValueBoxDef
       >
     ValueBoxDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ValueBoxDef
@@ -992,22 +993,22 @@ namespace CORBA
     ValueBoxDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_ABSTRACTINTERFACEDEF__VAR_OUT_CH_)
 #define _CORBA_ABSTRACTINTERFACEDEF__VAR_OUT_CH_
-  
+
   class AbstractInterfaceDef;
   typedef AbstractInterfaceDef *AbstractInterfaceDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         AbstractInterfaceDef
       >
     AbstractInterfaceDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         AbstractInterfaceDef
@@ -1015,15 +1016,15 @@ namespace CORBA
     AbstractInterfaceDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ_CH_)
 #define _CORBA_ABSTRACTINTERFACEDEFSEQ_CH_
-  
+
   class AbstractInterfaceDefSeq;
-  
+
   typedef
     TAO_MngSeq_Var_T<
         AbstractInterfaceDefSeq,
@@ -1033,7 +1034,7 @@ namespace CORBA
           >
       >
     AbstractInterfaceDefSeq_var;
-  
+
   typedef
     TAO_MngSeq_Out_T<
         AbstractInterfaceDefSeq,
@@ -1044,7 +1045,7 @@ namespace CORBA
           >
       >
     AbstractInterfaceDefSeq_out;
-  
+
   class TAO_IFR_Client_Export AbstractInterfaceDefSeq
     : public
         TAO_Unbounded_Object_Sequence<
@@ -1058,39 +1059,39 @@ namespace CORBA
     AbstractInterfaceDefSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        AbstractInterfaceDef_ptr* buffer, 
+        AbstractInterfaceDef_ptr* buffer,
         CORBA::Boolean release = 0
       );
     AbstractInterfaceDefSeq (const AbstractInterfaceDefSeq &);
     ~AbstractInterfaceDefSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef AbstractInterfaceDefSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_AbstractInterfaceDefSeq;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_LOCALINTERFACEDEF__VAR_OUT_CH_)
 #define _CORBA_LOCALINTERFACEDEF__VAR_OUT_CH_
-  
+
   class LocalInterfaceDef;
   typedef LocalInterfaceDef *LocalInterfaceDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         LocalInterfaceDef
       >
     LocalInterfaceDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         LocalInterfaceDef
@@ -1098,15 +1099,15 @@ namespace CORBA
     LocalInterfaceDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_LOCALINTERFACEDEFSEQ_CH_)
 #define _CORBA_LOCALINTERFACEDEFSEQ_CH_
-  
+
   class LocalInterfaceDefSeq;
-  
+
   typedef
     TAO_MngSeq_Var_T<
         LocalInterfaceDefSeq,
@@ -1116,7 +1117,7 @@ namespace CORBA
           >
       >
     LocalInterfaceDefSeq_var;
-  
+
   typedef
     TAO_MngSeq_Out_T<
         LocalInterfaceDefSeq,
@@ -1127,7 +1128,7 @@ namespace CORBA
           >
       >
     LocalInterfaceDefSeq_out;
-  
+
   class TAO_IFR_Client_Export LocalInterfaceDefSeq
     : public
         TAO_Unbounded_Object_Sequence<
@@ -1141,39 +1142,39 @@ namespace CORBA
     LocalInterfaceDefSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        LocalInterfaceDef_ptr* buffer, 
+        LocalInterfaceDef_ptr* buffer,
         CORBA::Boolean release = 0
       );
     LocalInterfaceDefSeq (const LocalInterfaceDefSeq &);
     ~LocalInterfaceDefSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef LocalInterfaceDefSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_LocalInterfaceDefSeq;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_EXTINTERFACEDEF__VAR_OUT_CH_)
 #define _CORBA_EXTINTERFACEDEF__VAR_OUT_CH_
-  
+
   class ExtInterfaceDef;
   typedef ExtInterfaceDef *ExtInterfaceDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ExtInterfaceDef
       >
     ExtInterfaceDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ExtInterfaceDef
@@ -1181,15 +1182,15 @@ namespace CORBA
     ExtInterfaceDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_EXTINTERFACEDEFSEQ_CH_)
 #define _CORBA_EXTINTERFACEDEFSEQ_CH_
-  
+
   class ExtInterfaceDefSeq;
-  
+
   typedef
     TAO_MngSeq_Var_T<
         ExtInterfaceDefSeq,
@@ -1199,7 +1200,7 @@ namespace CORBA
           >
       >
     ExtInterfaceDefSeq_var;
-  
+
   typedef
     TAO_MngSeq_Out_T<
         ExtInterfaceDefSeq,
@@ -1210,7 +1211,7 @@ namespace CORBA
           >
       >
     ExtInterfaceDefSeq_out;
-  
+
   class TAO_IFR_Client_Export ExtInterfaceDefSeq
     : public
         TAO_Unbounded_Object_Sequence<
@@ -1224,39 +1225,39 @@ namespace CORBA
     ExtInterfaceDefSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        ExtInterfaceDef_ptr* buffer, 
+        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 */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExtInterfaceDefSeq;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_EXTVALUEDEF__VAR_OUT_CH_)
 #define _CORBA_EXTVALUEDEF__VAR_OUT_CH_
-  
+
   class ExtValueDef;
   typedef ExtValueDef *ExtValueDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ExtValueDef
       >
     ExtValueDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ExtValueDef
@@ -1264,15 +1265,15 @@ namespace CORBA
     ExtValueDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_EXTVALUEDEFSEQ_CH_)
 #define _CORBA_EXTVALUEDEFSEQ_CH_
-  
+
   class ExtValueDefSeq;
-  
+
   typedef
     TAO_MngSeq_Var_T<
         ExtValueDefSeq,
@@ -1282,7 +1283,7 @@ namespace CORBA
           >
       >
     ExtValueDefSeq_var;
-  
+
   typedef
     TAO_MngSeq_Out_T<
         ExtValueDefSeq,
@@ -1293,7 +1294,7 @@ namespace CORBA
           >
       >
     ExtValueDefSeq_out;
-  
+
   class TAO_IFR_Client_Export ExtValueDefSeq
     : public
         TAO_Unbounded_Object_Sequence<
@@ -1307,39 +1308,39 @@ namespace CORBA
     ExtValueDefSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        ExtValueDef_ptr* buffer, 
+        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 */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExtValueDefSeq;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_EXTABSTRACTINTERFACEDEF__VAR_OUT_CH_)
 #define _CORBA_EXTABSTRACTINTERFACEDEF__VAR_OUT_CH_
-  
+
   class ExtAbstractInterfaceDef;
   typedef ExtAbstractInterfaceDef *ExtAbstractInterfaceDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ExtAbstractInterfaceDef
       >
     ExtAbstractInterfaceDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ExtAbstractInterfaceDef
@@ -1347,15 +1348,15 @@ namespace CORBA
     ExtAbstractInterfaceDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_EXTABSTRACTINTERFACEDEFSEQ_CH_)
 #define _CORBA_EXTABSTRACTINTERFACEDEFSEQ_CH_
-  
+
   class ExtAbstractInterfaceDefSeq;
-  
+
   typedef
     TAO_MngSeq_Var_T<
         ExtAbstractInterfaceDefSeq,
@@ -1365,7 +1366,7 @@ namespace CORBA
           >
       >
     ExtAbstractInterfaceDefSeq_var;
-  
+
   typedef
     TAO_MngSeq_Out_T<
         ExtAbstractInterfaceDefSeq,
@@ -1376,7 +1377,7 @@ namespace CORBA
           >
       >
     ExtAbstractInterfaceDefSeq_out;
-  
+
   class TAO_IFR_Client_Export ExtAbstractInterfaceDefSeq
     : public
         TAO_Unbounded_Object_Sequence<
@@ -1390,39 +1391,39 @@ namespace CORBA
     ExtAbstractInterfaceDefSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        ExtAbstractInterfaceDef_ptr* buffer, 
+        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 */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExtAbstractInterfaceDefSeq;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_EXTLOCALINTERFACEDEF__VAR_OUT_CH_)
 #define _CORBA_EXTLOCALINTERFACEDEF__VAR_OUT_CH_
-  
+
   class ExtLocalInterfaceDef;
   typedef ExtLocalInterfaceDef *ExtLocalInterfaceDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ExtLocalInterfaceDef
       >
     ExtLocalInterfaceDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ExtLocalInterfaceDef
@@ -1430,15 +1431,15 @@ namespace CORBA
     ExtLocalInterfaceDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_EXTLOCALINTERFACEDEFSEQ_CH_)
 #define _CORBA_EXTLOCALINTERFACEDEFSEQ_CH_
-  
+
   class ExtLocalInterfaceDefSeq;
-  
+
   typedef
     TAO_MngSeq_Var_T<
         ExtLocalInterfaceDefSeq,
@@ -1448,7 +1449,7 @@ namespace CORBA
           >
       >
     ExtLocalInterfaceDefSeq_var;
-  
+
   typedef
     TAO_MngSeq_Out_T<
         ExtLocalInterfaceDefSeq,
@@ -1459,7 +1460,7 @@ namespace CORBA
           >
       >
     ExtLocalInterfaceDefSeq_out;
-  
+
   class TAO_IFR_Client_Export ExtLocalInterfaceDefSeq
     : public
         TAO_Unbounded_Object_Sequence<
@@ -1473,32 +1474,32 @@ namespace CORBA
     ExtLocalInterfaceDefSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        ExtLocalInterfaceDef_ptr* buffer, 
+        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 */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExtLocalInterfaceDefSeq;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_CONTAINEDSEQ_CH_)
 #define _CORBA_CONTAINEDSEQ_CH_
-  
+
   class ContainedSeq;
-  
+
   typedef
     TAO_MngSeq_Var_T<
         ContainedSeq,
@@ -1508,7 +1509,7 @@ namespace CORBA
           >
       >
     ContainedSeq_var;
-  
+
   typedef
     TAO_MngSeq_Out_T<
         ContainedSeq,
@@ -1519,7 +1520,7 @@ namespace CORBA
           >
       >
     ContainedSeq_out;
-  
+
   class TAO_IFR_Client_Export ContainedSeq
     : public
         TAO_Unbounded_Object_Sequence<
@@ -1533,75 +1534,75 @@ namespace CORBA
     ContainedSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        Contained_ptr* buffer, 
+        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 */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ContainedSeq;
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct StructMember;
-  
+
   typedef
     TAO_Var_Var_T<
         StructMember
       >
     StructMember_var;
-  
+
   typedef
     TAO_Out_T<
         StructMember,
         StructMember_var
       >
     StructMember_out;
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
+  // be\be_visitor_structure/structure_ch.cpp:57
+
   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_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_StructMember;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_STRUCTMEMBERSEQ_CH_)
 #define _CORBA_STRUCTMEMBERSEQ_CH_
-  
+
   class StructMemberSeq;
-  
+
   typedef
     TAO_VarSeq_Var_T<
         StructMemberSeq,
         StructMember
       >
     StructMemberSeq_var;
-  
+
   typedef
     TAO_Seq_Out_T<
         StructMemberSeq,
@@ -1609,7 +1610,7 @@ namespace CORBA
         StructMember
       >
     StructMemberSeq_out;
-  
+
   class TAO_IFR_Client_Export StructMemberSeq
     : public
         TAO_Unbounded_Sequence<
@@ -1622,74 +1623,74 @@ namespace CORBA
     StructMemberSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        StructMember* buffer, 
+        StructMember* buffer,
         CORBA::Boolean release = 0
       );
     StructMemberSeq (const StructMemberSeq &);
     ~StructMemberSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef StructMemberSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_StructMemberSeq;
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct Initializer;
-  
+
   typedef
     TAO_Var_Var_T<
         Initializer
       >
     Initializer_var;
-  
+
   typedef
     TAO_Out_T<
         Initializer,
         Initializer_var
       >
     Initializer_out;
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
+  // be\be_visitor_structure/structure_ch.cpp:57
+
   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_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_Initializer;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_INITIALIZERSEQ_CH_)
 #define _CORBA_INITIALIZERSEQ_CH_
-  
+
   class InitializerSeq;
-  
+
   typedef
     TAO_VarSeq_Var_T<
         InitializerSeq,
         Initializer
       >
     InitializerSeq_var;
-  
+
   typedef
     TAO_Seq_Out_T<
         InitializerSeq,
@@ -1697,7 +1698,7 @@ namespace CORBA
         Initializer
       >
     InitializerSeq_out;
-  
+
   class TAO_IFR_Client_Export InitializerSeq
     : public
         TAO_Unbounded_Sequence<
@@ -1710,49 +1711,49 @@ namespace CORBA
     InitializerSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        Initializer* buffer, 
+        Initializer* buffer,
         CORBA::Boolean release = 0
       );
     InitializerSeq (const InitializerSeq &);
     ~InitializerSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef InitializerSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_InitializerSeq;
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct ExceptionDescription;
-  
+
   typedef
     TAO_Var_Var_T<
         ExceptionDescription
       >
     ExceptionDescription_var;
-  
+
   typedef
     TAO_Out_T<
         ExceptionDescription,
         ExceptionDescription_var
       >
     ExceptionDescription_out;
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
+  // be\be_visitor_structure/structure_ch.cpp:57
+
   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;
@@ -1760,27 +1761,27 @@ namespace CORBA
     TAO_String_Manager version;
     CORBA::TypeCode_var type;
   };
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExceptionDescription;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_EXCDESCRIPTIONSEQ_CH_)
 #define _CORBA_EXCDESCRIPTIONSEQ_CH_
-  
+
   class ExcDescriptionSeq;
-  
+
   typedef
     TAO_VarSeq_Var_T<
         ExcDescriptionSeq,
         ExceptionDescription
       >
     ExcDescriptionSeq_var;
-  
+
   typedef
     TAO_Seq_Out_T<
         ExcDescriptionSeq,
@@ -1788,7 +1789,7 @@ namespace CORBA
         ExceptionDescription
       >
     ExcDescriptionSeq_out;
-  
+
   class TAO_IFR_Client_Export ExcDescriptionSeq
     : public
         TAO_Unbounded_Sequence<
@@ -1801,75 +1802,75 @@ namespace CORBA
     ExcDescriptionSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        ExceptionDescription* buffer, 
+        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 */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExcDescriptionSeq;
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct ExtInitializer;
-  
+
   typedef
     TAO_Var_Var_T<
         ExtInitializer
       >
     ExtInitializer_var;
-  
+
   typedef
     TAO_Out_T<
         ExtInitializer,
         ExtInitializer_var
       >
     ExtInitializer_out;
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
+  // be\be_visitor_structure/structure_ch.cpp:57
+
   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
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExtInitializer;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_EXTINITIALIZERSEQ_CH_)
 #define _CORBA_EXTINITIALIZERSEQ_CH_
-  
+
   class ExtInitializerSeq;
-  
+
   typedef
     TAO_VarSeq_Var_T<
         ExtInitializerSeq,
         ExtInitializer
       >
     ExtInitializerSeq_var;
-  
+
   typedef
     TAO_Seq_Out_T<
         ExtInitializerSeq,
@@ -1877,7 +1878,7 @@ namespace CORBA
         ExtInitializer
       >
     ExtInitializerSeq_out;
-  
+
   class TAO_IFR_Client_Export ExtInitializerSeq
     : public
         TAO_Unbounded_Sequence<
@@ -1890,76 +1891,76 @@ namespace CORBA
     ExtInitializerSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        ExtInitializer* buffer, 
+        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 */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExtInitializerSeq;
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct UnionMember;
-  
+
   typedef
     TAO_Var_Var_T<
         UnionMember
       >
     UnionMember_var;
-  
+
   typedef
     TAO_Out_T<
         UnionMember,
         UnionMember_var
       >
     UnionMember_out;
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
+  // be\be_visitor_structure/structure_ch.cpp:57
+
   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_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_UnionMember;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_UNIONMEMBERSEQ_CH_)
 #define _CORBA_UNIONMEMBERSEQ_CH_
-  
+
   class UnionMemberSeq;
-  
+
   typedef
     TAO_VarSeq_Var_T<
         UnionMemberSeq,
         UnionMember
       >
     UnionMemberSeq_var;
-  
+
   typedef
     TAO_Seq_Out_T<
         UnionMemberSeq,
@@ -1967,7 +1968,7 @@ namespace CORBA
         UnionMember
       >
     UnionMemberSeq_out;
-  
+
   class TAO_IFR_Client_Export UnionMemberSeq
     : public
         TAO_Unbounded_Sequence<
@@ -1980,39 +1981,39 @@ namespace CORBA
     UnionMemberSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        UnionMember* buffer, 
+        UnionMember* buffer,
         CORBA::Boolean release = 0
       );
     UnionMemberSeq (const UnionMemberSeq &);
     ~UnionMemberSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef UnionMemberSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_UnionMemberSeq;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_ENUMMEMBERSEQ_CH_)
 #define _CORBA_ENUMMEMBERSEQ_CH_
-  
+
   class EnumMemberSeq;
-  
+
   typedef
     TAO_MngSeq_Var_T<
         EnumMemberSeq,
         TAO_SeqElem_String_Manager
       >
     EnumMemberSeq_var;
-  
+
   typedef
     TAO_MngSeq_Out_T<
         EnumMemberSeq,
@@ -2020,7 +2021,7 @@ namespace CORBA
         TAO_SeqElem_String_Manager
       >
     EnumMemberSeq_out;
-  
+
   class TAO_IFR_Client_Export EnumMemberSeq
     : public
         TAO_Unbounded_String_Sequence
@@ -2031,30 +2032,30 @@ namespace CORBA
     EnumMemberSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        char ** buffer, 
+        char ** buffer,
         CORBA::Boolean release = 0
       );
     EnumMemberSeq (const EnumMemberSeq &);
     ~EnumMemberSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef EnumMemberSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_EnumMemberSeq;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_CONTAINER_CH_)
 #define _CORBA_CONTAINER_CH_
-  
+
   class TAO_IFR_Client_Export Container
     : public virtual ::CORBA::IRObject
   {
@@ -2062,32 +2063,32 @@ namespace CORBA
     friend class TAO::Narrow_Utils<Container>;
     typedef Container_ptr _ptr_type;
     typedef Container_var _var_type;
-    
+
     // The static operations.
     static Container_ptr _duplicate (Container_ptr obj);
-    
+
     static void _tao_release (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 static_cast<Container_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::Contained_ptr lookup (
         const char * search_name
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2095,10 +2096,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::ContainedSeq * contents (
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
@@ -2107,10 +2108,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::ContainedSeq * lookup_name (
         const char * search_name,
         ::CORBA::Long levels_to_search,
@@ -2121,58 +2122,58 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_type.cpp:258
-    
+
     struct Description;
-    
+
     typedef
       TAO_Var_Var_T<
           Description
         >
       Description_var;
-    
+
     typedef
       TAO_Out_T<
           Description,
           Description_var
         >
       Description_out;
-    
+
     // TAO_IDL - Generated from
-    // be\be_visitor_structure/structure_ch.cpp:52
-    
+    // be\be_visitor_structure/structure_ch.cpp:57
+
     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_visitor_typecode/typecode_decl.cpp:44
-    
+    // be\be_visitor_typecode/typecode_decl.cpp:49
+
     static ::CORBA::TypeCode_ptr const _tc_Description;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_CONTAINER_DESCRIPTIONSEQ_CH_)
 #define _CORBA_CONTAINER_DESCRIPTIONSEQ_CH_
-    
+
     class DescriptionSeq;
-    
+
     typedef
       TAO_VarSeq_Var_T<
           DescriptionSeq,
           Description
         >
       DescriptionSeq_var;
-    
+
     typedef
       TAO_Seq_Out_T<
           DescriptionSeq,
@@ -2180,7 +2181,7 @@ namespace CORBA
           Description
         >
       DescriptionSeq_out;
-    
+
     class TAO_IFR_Client_Export DescriptionSeq
       : public
           TAO_Unbounded_Sequence<
@@ -2193,27 +2194,27 @@ namespace CORBA
       DescriptionSeq (
           CORBA::ULong max,
           CORBA::ULong length,
-          Description* buffer, 
+          Description* buffer,
           CORBA::Boolean release = 0
         );
       DescriptionSeq (const DescriptionSeq &);
       ~DescriptionSeq (void);
-      
+
       static void _tao_any_destructor (void *);
-      
+
       typedef DescriptionSeq_var _var_type;
     };
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
+    // be\be_visitor_typecode/typecode_decl.cpp:49
+
     static ::CORBA::TypeCode_ptr const _tc_DescriptionSeq;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::Container::DescriptionSeq * describe_contents (
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited,
@@ -2223,10 +2224,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::ModuleDef_ptr create_module (
         const char * id,
         const char * name,
@@ -2236,10 +2237,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::ConstantDef_ptr create_constant (
         const char * id,
         const char * name,
@@ -2251,10 +2252,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::StructDef_ptr create_struct (
         const char * id,
         const char * name,
@@ -2265,10 +2266,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::UnionDef_ptr create_union (
         const char * id,
         const char * name,
@@ -2280,10 +2281,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::EnumDef_ptr create_enum (
         const char * id,
         const char * name,
@@ -2294,10 +2295,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::AliasDef_ptr create_alias (
         const char * id,
         const char * name,
@@ -2308,10 +2309,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::InterfaceDef_ptr create_interface (
         const char * id,
         const char * name,
@@ -2322,10 +2323,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::ValueDef_ptr create_value (
         const char * id,
         const char * name,
@@ -2342,10 +2343,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::ValueBoxDef_ptr create_value_box (
         const char * id,
         const char * name,
@@ -2356,10 +2357,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::ExceptionDef_ptr create_exception (
         const char * id,
         const char * name,
@@ -2370,10 +2371,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::NativeDef_ptr create_native (
         const char * id,
         const char * name,
@@ -2383,10 +2384,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
         const char * id,
         const char * name,
@@ -2397,10 +2398,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::LocalInterfaceDef_ptr create_local_interface (
         const char * id,
         const char * name,
@@ -2411,10 +2412,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::ExtValueDef_ptr create_ext_value (
         const char * id,
         const char * name,
@@ -2431,34 +2432,34 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_Container_Proxy_Broker_;
-  
+
   protected:
     // Concrete interface only.
     Container (void);
-    
+
     // 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 (void);
-    
+
     // Concrete non-local interface only.
     Container (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     // Non-local interface only.
     Container (
         TAO_Stub *objref,
@@ -2466,29 +2467,29 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     virtual ~Container (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     Container (const Container &);
-    
+
     void operator= (const Container &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_Container;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_IDLTYPE_CH_)
 #define _CORBA_IDLTYPE_CH_
-  
+
   class TAO_IFR_Client_Export IDLType
     : public virtual ::CORBA::IRObject
   {
@@ -2496,66 +2497,66 @@ namespace CORBA
     friend class TAO::Narrow_Utils<IDLType>;
     typedef IDLType_ptr _ptr_type;
     typedef IDLType_var _var_type;
-    
+
     // The static operations.
     static IDLType_ptr _duplicate (IDLType_ptr obj);
-    
+
     static void _tao_release (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 static_cast<IDLType_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // 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:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_IDLType_Proxy_Broker_;
-  
+
   protected:
     // Concrete interface only.
     IDLType (void);
-    
+
     // 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 (void);
-    
+
     // Concrete non-local interface only.
     IDLType (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     // Non-local interface only.
     IDLType (
         TAO_Stub *objref,
@@ -2563,38 +2564,38 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     virtual ~IDLType (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     IDLType (const IDLType &);
-    
+
     void operator= (const IDLType &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_IDLType;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_TYPEDEFDEF__VAR_OUT_CH_)
 #define _CORBA_TYPEDEFDEF__VAR_OUT_CH_
-  
+
   class TypedefDef;
   typedef TypedefDef *TypedefDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         TypedefDef
       >
     TypedefDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         TypedefDef
@@ -2602,13 +2603,13 @@ namespace CORBA
     TypedefDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_TYPEDEFDEF_CH_)
 #define _CORBA_TYPEDEFDEF_CH_
-  
+
   class TAO_IFR_Client_Export TypedefDef
     : public virtual ::CORBA::Contained,
       public virtual ::CORBA::IDLType
@@ -2617,56 +2618,56 @@ namespace CORBA
     friend class TAO::Narrow_Utils<TypedefDef>;
     typedef TypedefDef_ptr _ptr_type;
     typedef TypedefDef_var _var_type;
-    
+
     // The static operations.
     static TypedefDef_ptr _duplicate (TypedefDef_ptr obj);
-    
+
     static void _tao_release (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 static_cast<TypedefDef_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_TypedefDef_Proxy_Broker_;
-  
+
   protected:
     // Concrete interface only.
     TypedefDef (void);
-    
+
     // 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 (void);
-    
+
     // Concrete non-local interface only.
     TypedefDef (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     // Non-local interface only.
     TypedefDef (
         TAO_Stub *objref,
@@ -2674,48 +2675,48 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     virtual ~TypedefDef (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     TypedefDef (const TypedefDef &);
-    
+
     void operator= (const TypedefDef &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_TypedefDef;
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct TypeDescription;
-  
+
   typedef
     TAO_Var_Var_T<
         TypeDescription
       >
     TypeDescription_var;
-  
+
   typedef
     TAO_Out_T<
         TypeDescription,
         TypeDescription_var
       >
     TypeDescription_out;
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
+  // be\be_visitor_structure/structure_ch.cpp:57
+
   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;
@@ -2723,10 +2724,10 @@ namespace CORBA
     TAO_String_Manager version;
     CORBA::TypeCode_var type;
   };
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_TypeDescription;
 
 // TAO_IDL - Generated from
@@ -2776,9 +2777,9 @@ TAO::Collocation_Proxy_Broker *
 namespace TAO
 {
 
-#if !defined (_CORBA_IROBJECT__TRAITS_CH_)
-#define _CORBA_IROBJECT__TRAITS_CH_
-  
+#if !defined (_CORBA_IROBJECT__TRAITS_)
+#define _CORBA_IROBJECT__TRAITS_
+
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::IRObject>
   {
@@ -2797,9 +2798,30 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_CONTAINED__TRAITS_CH_)
-#define _CORBA_CONTAINED__TRAITS_CH_
-  
+#if !defined (_CORBA_REPOSITORY__TRAITS_)
+#define _CORBA_REPOSITORY__TRAITS_
+
+  template<>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::Repository>
+  {
+    static ::CORBA::Repository_ptr duplicate (
+        ::CORBA::Repository_ptr
+      );
+    static void release (
+        ::CORBA::Repository_ptr
+      );
+    static ::CORBA::Repository_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::CORBA::Repository_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_CONTAINED__TRAITS_)
+#define _CORBA_CONTAINED__TRAITS_
+
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::Contained>
   {
@@ -2818,9 +2840,366 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_CONTAINER__TRAITS_CH_)
-#define _CORBA_CONTAINER__TRAITS_CH_
-  
+#if !defined (_CORBA_MODULEDEF__TRAITS_)
+#define _CORBA_MODULEDEF__TRAITS_
+
+  template<>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ModuleDef>
+  {
+    static ::CORBA::ModuleDef_ptr duplicate (
+        ::CORBA::ModuleDef_ptr
+      );
+    static void release (
+        ::CORBA::ModuleDef_ptr
+      );
+    static ::CORBA::ModuleDef_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::CORBA::ModuleDef_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_CONSTANTDEF__TRAITS_)
+#define _CORBA_CONSTANTDEF__TRAITS_
+
+  template<>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ConstantDef>
+  {
+    static ::CORBA::ConstantDef_ptr duplicate (
+        ::CORBA::ConstantDef_ptr
+      );
+    static void release (
+        ::CORBA::ConstantDef_ptr
+      );
+    static ::CORBA::ConstantDef_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::CORBA::ConstantDef_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_STRUCTDEF__TRAITS_)
+#define _CORBA_STRUCTDEF__TRAITS_
+
+  template<>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::StructDef>
+  {
+    static ::CORBA::StructDef_ptr duplicate (
+        ::CORBA::StructDef_ptr
+      );
+    static void release (
+        ::CORBA::StructDef_ptr
+      );
+    static ::CORBA::StructDef_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::CORBA::StructDef_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_UNIONDEF__TRAITS_)
+#define _CORBA_UNIONDEF__TRAITS_
+
+  template<>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::UnionDef>
+  {
+    static ::CORBA::UnionDef_ptr duplicate (
+        ::CORBA::UnionDef_ptr
+      );
+    static void release (
+        ::CORBA::UnionDef_ptr
+      );
+    static ::CORBA::UnionDef_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::CORBA::UnionDef_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_ENUMDEF__TRAITS_)
+#define _CORBA_ENUMDEF__TRAITS_
+
+  template<>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::EnumDef>
+  {
+    static ::CORBA::EnumDef_ptr duplicate (
+        ::CORBA::EnumDef_ptr
+      );
+    static void release (
+        ::CORBA::EnumDef_ptr
+      );
+    static ::CORBA::EnumDef_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::CORBA::EnumDef_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_ALIASDEF__TRAITS_)
+#define _CORBA_ALIASDEF__TRAITS_
+
+  template<>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::AliasDef>
+  {
+    static ::CORBA::AliasDef_ptr duplicate (
+        ::CORBA::AliasDef_ptr
+      );
+    static void release (
+        ::CORBA::AliasDef_ptr
+      );
+    static ::CORBA::AliasDef_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::CORBA::AliasDef_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_INTERFACEDEF__TRAITS_)
+#define _CORBA_INTERFACEDEF__TRAITS_
+
+  template<>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::InterfaceDef>
+  {
+    static ::CORBA::InterfaceDef_ptr duplicate (
+        ::CORBA::InterfaceDef_ptr
+      );
+    static void release (
+        ::CORBA::InterfaceDef_ptr
+      );
+    static ::CORBA::InterfaceDef_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::CORBA::InterfaceDef_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_EXCEPTIONDEF__TRAITS_)
+#define _CORBA_EXCEPTIONDEF__TRAITS_
+
+  template<>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExceptionDef>
+  {
+    static ::CORBA::ExceptionDef_ptr duplicate (
+        ::CORBA::ExceptionDef_ptr
+      );
+    static void release (
+        ::CORBA::ExceptionDef_ptr
+      );
+    static ::CORBA::ExceptionDef_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::CORBA::ExceptionDef_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_NATIVEDEF__TRAITS_)
+#define _CORBA_NATIVEDEF__TRAITS_
+
+  template<>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::NativeDef>
+  {
+    static ::CORBA::NativeDef_ptr duplicate (
+        ::CORBA::NativeDef_ptr
+      );
+    static void release (
+        ::CORBA::NativeDef_ptr
+      );
+    static ::CORBA::NativeDef_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::CORBA::NativeDef_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_VALUEDEF__TRAITS_)
+#define _CORBA_VALUEDEF__TRAITS_
+
+  template<>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ValueDef>
+  {
+    static ::CORBA::ValueDef_ptr duplicate (
+        ::CORBA::ValueDef_ptr
+      );
+    static void release (
+        ::CORBA::ValueDef_ptr
+      );
+    static ::CORBA::ValueDef_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::CORBA::ValueDef_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_VALUEBOXDEF__TRAITS_)
+#define _CORBA_VALUEBOXDEF__TRAITS_
+
+  template<>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ValueBoxDef>
+  {
+    static ::CORBA::ValueBoxDef_ptr duplicate (
+        ::CORBA::ValueBoxDef_ptr
+      );
+    static void release (
+        ::CORBA::ValueBoxDef_ptr
+      );
+    static ::CORBA::ValueBoxDef_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::CORBA::ValueBoxDef_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_ABSTRACTINTERFACEDEF__TRAITS_)
+#define _CORBA_ABSTRACTINTERFACEDEF__TRAITS_
+
+  template<>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::AbstractInterfaceDef>
+  {
+    static ::CORBA::AbstractInterfaceDef_ptr duplicate (
+        ::CORBA::AbstractInterfaceDef_ptr
+      );
+    static void release (
+        ::CORBA::AbstractInterfaceDef_ptr
+      );
+    static ::CORBA::AbstractInterfaceDef_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::CORBA::AbstractInterfaceDef_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_LOCALINTERFACEDEF__TRAITS_)
+#define _CORBA_LOCALINTERFACEDEF__TRAITS_
+
+  template<>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::LocalInterfaceDef>
+  {
+    static ::CORBA::LocalInterfaceDef_ptr duplicate (
+        ::CORBA::LocalInterfaceDef_ptr
+      );
+    static void release (
+        ::CORBA::LocalInterfaceDef_ptr
+      );
+    static ::CORBA::LocalInterfaceDef_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::CORBA::LocalInterfaceDef_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_EXTINTERFACEDEF__TRAITS_)
+#define _CORBA_EXTINTERFACEDEF__TRAITS_
+
+  template<>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExtInterfaceDef>
+  {
+    static ::CORBA::ExtInterfaceDef_ptr duplicate (
+        ::CORBA::ExtInterfaceDef_ptr
+      );
+    static void release (
+        ::CORBA::ExtInterfaceDef_ptr
+      );
+    static ::CORBA::ExtInterfaceDef_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::CORBA::ExtInterfaceDef_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_EXTVALUEDEF__TRAITS_)
+#define _CORBA_EXTVALUEDEF__TRAITS_
+
+  template<>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExtValueDef>
+  {
+    static ::CORBA::ExtValueDef_ptr duplicate (
+        ::CORBA::ExtValueDef_ptr
+      );
+    static void release (
+        ::CORBA::ExtValueDef_ptr
+      );
+    static ::CORBA::ExtValueDef_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::CORBA::ExtValueDef_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_EXTABSTRACTINTERFACEDEF__TRAITS_)
+#define _CORBA_EXTABSTRACTINTERFACEDEF__TRAITS_
+
+  template<>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExtAbstractInterfaceDef>
+  {
+    static ::CORBA::ExtAbstractInterfaceDef_ptr duplicate (
+        ::CORBA::ExtAbstractInterfaceDef_ptr
+      );
+    static void release (
+        ::CORBA::ExtAbstractInterfaceDef_ptr
+      );
+    static ::CORBA::ExtAbstractInterfaceDef_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::CORBA::ExtAbstractInterfaceDef_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_EXTLOCALINTERFACEDEF__TRAITS_)
+#define _CORBA_EXTLOCALINTERFACEDEF__TRAITS_
+
+  template<>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExtLocalInterfaceDef>
+  {
+    static ::CORBA::ExtLocalInterfaceDef_ptr duplicate (
+        ::CORBA::ExtLocalInterfaceDef_ptr
+      );
+    static void release (
+        ::CORBA::ExtLocalInterfaceDef_ptr
+      );
+    static ::CORBA::ExtLocalInterfaceDef_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::CORBA::ExtLocalInterfaceDef_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_CONTAINER__TRAITS_)
+#define _CORBA_CONTAINER__TRAITS_
+
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::Container>
   {
@@ -2839,9 +3218,9 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_IDLTYPE__TRAITS_CH_)
-#define _CORBA_IDLTYPE__TRAITS_CH_
-  
+#if !defined (_CORBA_IDLTYPE__TRAITS_)
+#define _CORBA_IDLTYPE__TRAITS_
+
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::IDLType>
   {
@@ -2860,9 +3239,9 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_TYPEDEFDEF__TRAITS_CH_)
-#define _CORBA_TYPEDEFDEF__TRAITS_CH_
-  
+#if !defined (_CORBA_TYPEDEFDEF__TRAITS_)
+#define _CORBA_TYPEDEFDEF__TRAITS_
+
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::TypedefDef>
   {
@@ -2883,13 +3262,13 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_ch.cpp:51
+// be\be_visitor_enum/any_op_ch.cpp:52
 
 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
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 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
@@ -2903,14 +3282,14 @@ TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::Repository_ptr *);
 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
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 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
+// be\be_visitor_structure/any_op_ch.cpp:53
 
 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
@@ -2967,7 +3346,7 @@ TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::InterfaceDef_ptr *)
 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
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 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
@@ -2996,7 +3375,7 @@ TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ValueDef_ptr *); //
 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
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 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
@@ -3018,7 +3397,7 @@ TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::AbstractInterfaceDe
 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
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 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
@@ -3033,7 +3412,7 @@ TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::LocalInterfaceDef_p
 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
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 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
@@ -3048,7 +3427,7 @@ TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtInterfaceDef_ptr
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExtInterfaceDef *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 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
@@ -3063,7 +3442,7 @@ TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtValueDef_ptr *);
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExtValueDef *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 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
@@ -3078,7 +3457,7 @@ TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtAbstractInterfac
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExtAbstractInterfaceDef *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 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
@@ -3093,7 +3472,7 @@ TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtLocalInterfaceDe
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExtLocalInterfaceDef *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 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
@@ -3101,7 +3480,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Ext
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ExtLocalInterfaceDefSeq *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 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
@@ -3109,7 +3488,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::ContainedSeq *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
+// be\be_visitor_structure/any_op_ch.cpp:53
 
 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
@@ -3117,7 +3496,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
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 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
@@ -3125,7 +3504,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
+// be\be_visitor_structure/any_op_ch.cpp:53
 
 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
@@ -3133,7 +3512,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
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 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
@@ -3141,7 +3520,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::InitializerSeq *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
+// be\be_visitor_structure/any_op_ch.cpp:53
 
 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
@@ -3149,7 +3528,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Exc
 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
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 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
@@ -3157,7 +3536,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Exc
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ExcDescriptionSeq *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
+// be\be_visitor_structure/any_op_ch.cpp:53
 
 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
@@ -3165,7 +3544,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Ext
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ExtInitializer *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 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
@@ -3173,7 +3552,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Ext
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ExtInitializerSeq *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
+// be\be_visitor_structure/any_op_ch.cpp:53
 
 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
@@ -3181,7 +3560,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
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 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
@@ -3189,7 +3568,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
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 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
@@ -3197,14 +3576,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
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 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
+// be\be_visitor_structure/any_op_ch.cpp:53
 
 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
@@ -3212,7 +3591,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
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 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
@@ -3220,21 +3599,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
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 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
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 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
+// be\be_visitor_structure/any_op_ch.cpp:53
 
 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
@@ -3724,7 +4103,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::T
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::TypeDescription &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
+// be\be_codegen.cpp:1136
 
 #if defined (__ACE_INLINE__)
 #include "IFR_BaseC.inl"
diff --git a/TAO/tao/IFR_Client/IFR_BaseS.h b/TAO/tao/IFR_Client/IFR_BaseS.h
index 910bbfc9646..1fea87667c7 100644
--- a/TAO/tao/IFR_Client/IFR_BaseS.h
+++ b/TAO/tao/IFR_Client/IFR_BaseS.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:398
+// be\be_codegen.cpp:393
 
 #ifndef _TAO_IDL_ORIG_IFR_BASES_H_
 #define _TAO_IDL_ORIG_IFR_BASES_H_
@@ -55,20 +55,20 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_sh.cpp:49
+// be\be_visitor_module/module_sh.cpp:49
 
 namespace POA_CORBA
 {
 
 
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_sh.cpp:87
+  // be\be_visitor_interface/interface_sh.cpp:87
 
   class IRObject;
   typedef IRObject *IRObject_ptr;
 
 
-  class TAO_IFR_Client_Export IRObject
+  class  IRObject
     : public virtual PortableServer::ServantBase
   {
   protected:
@@ -116,6 +116,13 @@ namespace POA_CORBA
         ACE_ENV_ARG_DECL
       );
 
+    static void _repository_id_skel (
+        TAO_ServerRequest & req,
+        void * servant_upcall,
+        void * servant
+        ACE_ENV_ARG_DECL
+      );
+
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
@@ -129,7 +136,7 @@ namespace POA_CORBA
     virtual const char* _interface_repository_id (void) const;
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::DefinitionKind def_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -146,7 +153,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -164,13 +171,13 @@ namespace POA_CORBA
   };
 
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_sh.cpp:87
+  // be\be_visitor_interface/interface_sh.cpp:87
 
   class Contained;
   typedef Contained *Contained_ptr;
 
 
-  class TAO_IFR_Client_Export Contained
+  class  Contained
     : public virtual POA_CORBA::IRObject
   {
   protected:
@@ -218,6 +225,13 @@ namespace POA_CORBA
         ACE_ENV_ARG_DECL
       );
 
+    static void _repository_id_skel (
+        TAO_ServerRequest & req,
+        void * servant_upcall,
+        void * servant
+        ACE_ENV_ARG_DECL
+      );
+
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
@@ -231,7 +245,7 @@ namespace POA_CORBA
     virtual const char* _interface_repository_id (void) const;
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual char * id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -248,7 +262,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual void id (
         const char * id
@@ -266,7 +280,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual char * name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -283,7 +297,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual void name (
         const char * name
@@ -301,7 +315,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual char * version (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -318,7 +332,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual void version (
         const char * version
@@ -336,7 +350,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::Container_ptr defined_in (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -353,7 +367,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual char * absolute_name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -370,7 +384,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::Repository_ptr containing_repository (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -387,7 +401,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::Contained::Description * describe (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -404,7 +418,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual void move (
         ::CORBA::Container_ptr new_container,
@@ -432,7 +446,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1859
+    // be\be_interface.cpp:1869
 
     static void
     destroy_skel (
@@ -444,13 +458,13 @@ namespace POA_CORBA
   };
 
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_sh.cpp:87
+  // be\be_visitor_interface/interface_sh.cpp:87
 
   class Container;
   typedef Container *Container_ptr;
 
 
-  class TAO_IFR_Client_Export Container
+  class  Container
     : public virtual POA_CORBA::IRObject
   {
   protected:
@@ -498,6 +512,13 @@ namespace POA_CORBA
         ACE_ENV_ARG_DECL
       );
 
+    static void _repository_id_skel (
+        TAO_ServerRequest & req,
+        void * servant_upcall,
+        void * servant
+        ACE_ENV_ARG_DECL
+      );
+
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
@@ -511,7 +532,7 @@ namespace POA_CORBA
     virtual const char* _interface_repository_id (void) const;
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::Contained_ptr lookup (
         const char * search_name
@@ -529,7 +550,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::ContainedSeq * contents (
         ::CORBA::DefinitionKind limit_type,
@@ -548,7 +569,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::ContainedSeq * lookup_name (
         const char * search_name,
@@ -569,7 +590,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::Container::DescriptionSeq * describe_contents (
         ::CORBA::DefinitionKind limit_type,
@@ -589,7 +610,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::ModuleDef_ptr create_module (
         const char * id,
@@ -609,7 +630,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::ConstantDef_ptr create_constant (
         const char * id,
@@ -631,7 +652,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::StructDef_ptr create_struct (
         const char * id,
@@ -652,7 +673,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::UnionDef_ptr create_union (
         const char * id,
@@ -674,7 +695,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::EnumDef_ptr create_enum (
         const char * id,
@@ -695,7 +716,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::AliasDef_ptr create_alias (
         const char * id,
@@ -716,7 +737,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::InterfaceDef_ptr create_interface (
         const char * id,
@@ -737,7 +758,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::ValueDef_ptr create_value (
         const char * id,
@@ -764,7 +785,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::ValueBoxDef_ptr create_value_box (
         const char * id,
@@ -785,7 +806,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::ExceptionDef_ptr create_exception (
         const char * id,
@@ -806,7 +827,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::NativeDef_ptr create_native (
         const char * id,
@@ -826,7 +847,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
         const char * id,
@@ -847,7 +868,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::LocalInterfaceDef_ptr create_local_interface (
         const char * id,
@@ -868,7 +889,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::ExtValueDef_ptr create_ext_value (
         const char * id,
@@ -903,7 +924,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1859
+    // be\be_interface.cpp:1869
 
     static void
     destroy_skel (
@@ -915,13 +936,13 @@ namespace POA_CORBA
   };
 
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_sh.cpp:87
+  // be\be_visitor_interface/interface_sh.cpp:87
 
   class IDLType;
   typedef IDLType *IDLType_ptr;
 
 
-  class TAO_IFR_Client_Export IDLType
+  class  IDLType
     : public virtual POA_CORBA::IRObject
   {
   protected:
@@ -969,6 +990,13 @@ namespace POA_CORBA
         ACE_ENV_ARG_DECL
       );
 
+    static void _repository_id_skel (
+        TAO_ServerRequest & req,
+        void * servant_upcall,
+        void * servant
+        ACE_ENV_ARG_DECL
+      );
+
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
@@ -982,7 +1010,7 @@ namespace POA_CORBA
     virtual const char* _interface_repository_id (void) const;
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual CORBA::TypeCode_ptr type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1007,7 +1035,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1859
+    // be\be_interface.cpp:1869
 
     static void
     destroy_skel (
@@ -1019,13 +1047,13 @@ namespace POA_CORBA
   };
 
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_sh.cpp:87
+  // be\be_visitor_interface/interface_sh.cpp:87
 
   class TypedefDef;
   typedef TypedefDef *TypedefDef_ptr;
 
 
-  class TAO_IFR_Client_Export TypedefDef
+  class  TypedefDef
     : public virtual POA_CORBA::Contained,
       public virtual POA_CORBA::IDLType
   {
@@ -1074,6 +1102,13 @@ namespace POA_CORBA
         ACE_ENV_ARG_DECL
       );
 
+    static void _repository_id_skel (
+        TAO_ServerRequest & req,
+        void * servant_upcall,
+        void * servant
+        ACE_ENV_ARG_DECL
+      );
+
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
@@ -1095,7 +1130,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1859
+    // be\be_interface.cpp:1869
 
     static void
     destroy_skel (
@@ -1178,7 +1213,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1859
+    // be\be_interface.cpp:1869
 
     static void
     describe_skel (
@@ -1189,7 +1224,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1859
+    // be\be_interface.cpp:1869
 
     static void
     move_skel (
@@ -1209,14 +1244,10 @@ namespace POA_CORBA
   };
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_sh.cpp:80
+// be\be_visitor_module/module_sh.cpp:80
 
 } // module CORBA
 
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:1005
-
-
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/IFR_Client/IFR_Basic.pidl b/TAO/tao/IFR_Client/IFR_Basic.pidl
index 6eb0b37463e..fa156e72b2d 100644
--- a/TAO/tao/IFR_Client/IFR_Basic.pidl
+++ b/TAO/tao/IFR_Client/IFR_Basic.pidl
@@ -1,55 +1,49 @@
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO_IFR_Client
-//
-// = FILENAME
-//   IFR_Basic.pidl
-//
-// = DESCRIPTION
-//   This file was used to generate the code in IFR_BasicC.{h,i,cpp}.
-//   The original file Interface.idl was split into four pieces, to
-//   keep the generated files to a manageable size and reduce build
-//   time. This IDL file contains the concrete base interfaces of
-//   the IFR, except for fixed types, valuetypes and CORBA components.
-//
-//   The command used to generate code from this IDL file is:
-//
-//     tao_idl -Ge 1 -Sc -GA -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
-//
-//   Only the stub files are used in the TAO_IFR_Client library. The
-//   skeleton files can be deleted from this directory.
-//
-//   No patching of the generated stub files is necessary.
-//
-//   To generate the skeleton files for the IFR Service, the command is:
-//
-//     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 skeleton 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.
-//
-// ================================================================
+ // -*- IDL -*-
+
+/**
+ * @file IFR_Basic.pidl
+ *
+ * $Id$
+ *
+ * This file was used to generate the code in IFR_BasicC.{h,inl,cpp}.
+ * The original file Interface.idl was split into four pieces, to
+ * keep the generated files to a manageable size and reduce build
+ * time. This IDL file contains the concrete base interfaces of
+ * the IFR, except for fixed types, valuetypes and CORBA components.
+ *
+ * The command used to generate code from this IDL file is:
+ *
+ *     tao_idl -Ge 1 -Sc -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
+ *
+ *   Only the stub files are used in the TAO_IFR_Client library. The
+ *   skeleton files can be deleted from this directory.
+ *
+ *   No patching of the generated stub files is necessary.
+ *
+ *   To generate the skeleton files for the IFR Service, the command is:
+ *
+ *     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 skeleton 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_
 #define _IFR_BASIC_IDL_
diff --git a/TAO/tao/IFR_Client/IFR_BasicA.cpp b/TAO/tao/IFR_Client/IFR_BasicA.cpp
deleted file mode 100644
index fb92aa67a5d..00000000000
--- a/TAO/tao/IFR_Client/IFR_BasicA.cpp
+++ /dev/null
@@ -1,3626 +0,0 @@
-// -*- 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/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "IFR_BasicC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Enum_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
-#include "tao/Any_Basic_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/enum_typecode.cpp:34
-
-static char const * const _tao_enumerators_CORBA_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"
-    
-  };
-
-static TAO::TypeCode::Enum<char const *,
-                           char const * const *,
-                           TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_PrimitiveKind (
-    "IDL:omg.org/CORBA/PrimitiveKind:1.0",
-    "PrimitiveKind",
-    _tao_enumerators_CORBA_PrimitiveKind,
-    22);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_PrimitiveKind =
-    &_tao_tc_CORBA_PrimitiveKind;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_Repository (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/Repository:1.0",
-    "Repository");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_Repository =
-    &_tao_tc_CORBA_Repository;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ModuleDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ModuleDef:1.0",
-    "ModuleDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ModuleDef =
-    &_tao_tc_CORBA_ModuleDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ModuleDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ModuleDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/ModuleDescription:1.0",
-    "ModuleDescription",
-    _tao_fields_CORBA_ModuleDescription,
-    4);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ModuleDescription =
-    &_tao_tc_CORBA_ModuleDescription;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ConstantDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ConstantDef:1.0",
-    "ConstantDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ConstantDef =
-    &_tao_tc_CORBA_ConstantDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ConstantDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec },
-    { "type", &CORBA::_tc_TypeCode },
-    { "value", &CORBA::_tc_any }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ConstantDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/ConstantDescription:1.0",
-    "ConstantDescription",
-    _tao_fields_CORBA_ConstantDescription,
-    6);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ConstantDescription =
-    &_tao_tc_CORBA_ConstantDescription;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_StructDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/StructDef:1.0",
-    "StructDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_StructDef =
-    &_tao_tc_CORBA_StructDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_UnionDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/UnionDef:1.0",
-    "UnionDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_UnionDef =
-    &_tao_tc_CORBA_UnionDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_EnumDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/EnumDef:1.0",
-    "EnumDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_EnumDef =
-    &_tao_tc_CORBA_EnumDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_AliasDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/AliasDef:1.0",
-    "AliasDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_AliasDef =
-    &_tao_tc_CORBA_AliasDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_NativeDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/NativeDef:1.0",
-    "NativeDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_NativeDef =
-    &_tao_tc_CORBA_NativeDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_PrimitiveDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/PrimitiveDef:1.0",
-    "PrimitiveDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_PrimitiveDef =
-    &_tao_tc_CORBA_PrimitiveDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_StringDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/StringDef:1.0",
-    "StringDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_StringDef =
-    &_tao_tc_CORBA_StringDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_WstringDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/WstringDef:1.0",
-    "WstringDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_WstringDef =
-    &_tao_tc_CORBA_WstringDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_SequenceDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/SequenceDef:1.0",
-    "SequenceDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_SequenceDef =
-    &_tao_tc_CORBA_SequenceDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ArrayDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ArrayDef:1.0",
-    "ArrayDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ArrayDef =
-    &_tao_tc_CORBA_ArrayDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ExceptionDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ExceptionDef:1.0",
-    "ExceptionDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ExceptionDef =
-    &_tao_tc_CORBA_ExceptionDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_ExceptionDefSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ExceptionDefSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ExceptionDefSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_ExceptionDef,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ExceptionDefSeq_0 =
-      &CORBA_ExceptionDefSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ExceptionDefSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ExceptionDefSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ExceptionDefSeq:1.0",
-    "ExceptionDefSeq",
-    &TAO::TypeCode::tc_CORBA_ExceptionDefSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ExceptionDefSeq =
-    &_tao_tc_CORBA_ExceptionDefSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/enum_typecode.cpp:34
-
-static char const * const _tao_enumerators_CORBA_AttributeMode[] =
-  {
-    "ATTR_NORMAL",
-    "ATTR_READONLY"
-    
-  };
-
-static TAO::TypeCode::Enum<char const *,
-                           char const * const *,
-                           TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_AttributeMode (
-    "IDL:omg.org/CORBA/AttributeMode:1.0",
-    "AttributeMode",
-    _tao_enumerators_CORBA_AttributeMode,
-    2);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_AttributeMode =
-    &_tao_tc_CORBA_AttributeMode;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_AttributeDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/AttributeDef:1.0",
-    "AttributeDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_AttributeDef =
-    &_tao_tc_CORBA_AttributeDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_AttributeDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec },
-    { "type", &CORBA::_tc_TypeCode },
-    { "mode", &CORBA::_tc_AttributeMode }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_AttributeDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/AttributeDescription:1.0",
-    "AttributeDescription",
-    _tao_fields_CORBA_AttributeDescription,
-    6);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_AttributeDescription =
-    &_tao_tc_CORBA_AttributeDescription;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ExtAttributeDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec },
-    { "type", &CORBA::_tc_TypeCode },
-    { "mode", &CORBA::_tc_AttributeMode },
-    { "get_exceptions", &CORBA::_tc_ExcDescriptionSeq },
-    { "put_exceptions", &CORBA::_tc_ExcDescriptionSeq }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ExtAttributeDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/ExtAttributeDescription:1.0",
-    "ExtAttributeDescription",
-    _tao_fields_CORBA_ExtAttributeDescription,
-    8);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ExtAttributeDescription =
-    &_tao_tc_CORBA_ExtAttributeDescription;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ExtAttributeDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ExtAttributeDef:1.0",
-    "ExtAttributeDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ExtAttributeDef =
-    &_tao_tc_CORBA_ExtAttributeDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/enum_typecode.cpp:34
-
-static char const * const _tao_enumerators_CORBA_OperationMode[] =
-  {
-    "OP_NORMAL",
-    "OP_ONEWAY"
-    
-  };
-
-static TAO::TypeCode::Enum<char const *,
-                           char const * const *,
-                           TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_OperationMode (
-    "IDL:omg.org/CORBA/OperationMode:1.0",
-    "OperationMode",
-    _tao_enumerators_CORBA_OperationMode,
-    2);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_OperationMode =
-    &_tao_tc_CORBA_OperationMode;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ParameterDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "type", &CORBA::_tc_TypeCode },
-    { "type_def", &CORBA::_tc_IDLType },
-    { "mode", &CORBA::_tc_ParameterMode }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ParameterDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/ParameterDescription:1.0",
-    "ParameterDescription",
-    _tao_fields_CORBA_ParameterDescription,
-    4);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ParameterDescription =
-    &_tao_tc_CORBA_ParameterDescription;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_ParDescriptionSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ParDescriptionSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ParDescriptionSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_ParameterDescription,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ParDescriptionSeq_0 =
-      &CORBA_ParDescriptionSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ParDescriptionSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ParDescriptionSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ParDescriptionSeq:1.0",
-    "ParDescriptionSeq",
-    &TAO::TypeCode::tc_CORBA_ParDescriptionSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ParDescriptionSeq =
-    &_tao_tc_CORBA_ParDescriptionSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ContextIdentifier (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ContextIdentifier:1.0",
-    "ContextIdentifier",
-    &CORBA::_tc_Identifier);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ContextIdentifier =
-    &_tao_tc_CORBA_ContextIdentifier;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_ContextIdSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ContextIdSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ContextIdSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_ContextIdentifier,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ContextIdSeq_0 =
-      &CORBA_ContextIdSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ContextIdSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ContextIdSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ContextIdSeq:1.0",
-    "ContextIdSeq",
-    &TAO::TypeCode::tc_CORBA_ContextIdSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ContextIdSeq =
-    &_tao_tc_CORBA_ContextIdSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_OperationDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/OperationDef:1.0",
-    "OperationDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_OperationDef =
-    &_tao_tc_CORBA_OperationDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_OperationDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec },
-    { "result", &CORBA::_tc_TypeCode },
-    { "mode", &CORBA::_tc_OperationMode },
-    { "contexts", &CORBA::_tc_ContextIdSeq },
-    { "parameters", &CORBA::_tc_ParDescriptionSeq },
-    { "exceptions", &CORBA::_tc_ExcDescriptionSeq }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_OperationDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/OperationDescription:1.0",
-    "OperationDescription",
-    _tao_fields_CORBA_OperationDescription,
-    9);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_OperationDescription =
-    &_tao_tc_CORBA_OperationDescription;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_RepositoryIdSeq_GUARD
-#define _TAO_TYPECODE_CORBA_RepositoryIdSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_RepositoryIdSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_RepositoryId,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_RepositoryIdSeq_0 =
-      &CORBA_RepositoryIdSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_RepositoryIdSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_RepositoryIdSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/RepositoryIdSeq:1.0",
-    "RepositoryIdSeq",
-    &TAO::TypeCode::tc_CORBA_RepositoryIdSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_RepositoryIdSeq =
-    &_tao_tc_CORBA_RepositoryIdSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_OpDescriptionSeq_GUARD
-#define _TAO_TYPECODE_CORBA_OpDescriptionSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_OpDescriptionSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_OperationDescription,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_OpDescriptionSeq_0 =
-      &CORBA_OpDescriptionSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_OpDescriptionSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_OpDescriptionSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/OpDescriptionSeq:1.0",
-    "OpDescriptionSeq",
-    &TAO::TypeCode::tc_CORBA_OpDescriptionSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_OpDescriptionSeq =
-    &_tao_tc_CORBA_OpDescriptionSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_AttrDescriptionSeq_GUARD
-#define _TAO_TYPECODE_CORBA_AttrDescriptionSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_AttrDescriptionSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_AttributeDescription,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_AttrDescriptionSeq_0 =
-      &CORBA_AttrDescriptionSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_AttrDescriptionSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_AttrDescriptionSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/AttrDescriptionSeq:1.0",
-    "AttrDescriptionSeq",
-    &TAO::TypeCode::tc_CORBA_AttrDescriptionSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_AttrDescriptionSeq =
-    &_tao_tc_CORBA_AttrDescriptionSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_ExtAttrDescriptionSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ExtAttrDescriptionSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ExtAttrDescriptionSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_ExtAttributeDescription,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ExtAttrDescriptionSeq_0 =
-      &CORBA_ExtAttrDescriptionSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ExtAttrDescriptionSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ExtAttrDescriptionSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ExtAttrDescriptionSeq:1.0",
-    "ExtAttrDescriptionSeq",
-    &TAO::TypeCode::tc_CORBA_ExtAttrDescriptionSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ExtAttrDescriptionSeq =
-    &_tao_tc_CORBA_ExtAttrDescriptionSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_InterfaceDef_FullInterfaceDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec },
-    { "operations", &CORBA::_tc_OpDescriptionSeq },
-    { "attributes", &CORBA::_tc_AttrDescriptionSeq },
-    { "base_interfaces", &CORBA::_tc_RepositoryIdSeq },
-    { "type", &CORBA::_tc_TypeCode }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_InterfaceDef_FullInterfaceDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/InterfaceDef/FullInterfaceDescription:1.0",
-    "FullInterfaceDescription",
-    _tao_fields_CORBA_InterfaceDef_FullInterfaceDescription,
-    8);
-  
-::CORBA::TypeCode_ptr const CORBA::InterfaceDef::_tc_FullInterfaceDescription =
-  &_tao_tc_CORBA_InterfaceDef_FullInterfaceDescription;
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_InterfaceDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/InterfaceDef:1.0",
-    "InterfaceDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_InterfaceDef =
-    &_tao_tc_CORBA_InterfaceDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_InterfaceDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec },
-    { "base_interfaces", &CORBA::_tc_RepositoryIdSeq }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_InterfaceDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/InterfaceDescription:1.0",
-    "InterfaceDescription",
-    _tao_fields_CORBA_InterfaceDescription,
-    5);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_InterfaceDescription =
-    &_tao_tc_CORBA_InterfaceDescription;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_InterfaceAttrExtension_ExtFullInterfaceDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec },
-    { "operations", &CORBA::_tc_OpDescriptionSeq },
-    { "attributes", &CORBA::_tc_ExtAttrDescriptionSeq },
-    { "base_interfaces", &CORBA::_tc_RepositoryIdSeq },
-    { "type", &CORBA::_tc_TypeCode }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_InterfaceAttrExtension_ExtFullInterfaceDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/InterfaceAttrExtension/ExtFullInterfaceDescription:1.0",
-    "ExtFullInterfaceDescription",
-    _tao_fields_CORBA_InterfaceAttrExtension_ExtFullInterfaceDescription,
-    8);
-  
-::CORBA::TypeCode_ptr const CORBA::InterfaceAttrExtension::_tc_ExtFullInterfaceDescription =
-  &_tao_tc_CORBA_InterfaceAttrExtension_ExtFullInterfaceDescription;
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_InterfaceAttrExtension (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/InterfaceAttrExtension:1.0",
-    "InterfaceAttrExtension");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_InterfaceAttrExtension =
-    &_tao_tc_CORBA_InterfaceAttrExtension;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ExtInterfaceDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ExtInterfaceDef:1.0",
-    "ExtInterfaceDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ExtInterfaceDef =
-    &_tao_tc_CORBA_ExtInterfaceDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_AbstractInterfaceDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/AbstractInterfaceDef:1.0",
-    "AbstractInterfaceDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_AbstractInterfaceDef =
-    &_tao_tc_CORBA_AbstractInterfaceDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ExtAbstractInterfaceDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ExtAbstractInterfaceDef:1.0",
-    "ExtAbstractInterfaceDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ExtAbstractInterfaceDef =
-    &_tao_tc_CORBA_ExtAbstractInterfaceDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_LocalInterfaceDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/LocalInterfaceDef:1.0",
-    "LocalInterfaceDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_LocalInterfaceDef =
-    &_tao_tc_CORBA_LocalInterfaceDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ExtLocalInterfaceDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ExtLocalInterfaceDef:1.0",
-    "ExtLocalInterfaceDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ExtLocalInterfaceDef =
-    &_tao_tc_CORBA_ExtLocalInterfaceDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// 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 
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::Repository>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::Repository_ptr _tao_elem
-  )
-{
-  CORBA::Repository_ptr _tao_objptr =
-    CORBA::Repository::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::Repository_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::Repository>::insert (
-      _tao_any,
-      CORBA::Repository::_tao_any_destructor,
-      CORBA::_tc_Repository,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::Repository_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::Repository>::extract (
-        _tao_any,
-        CORBA::Repository::_tao_any_destructor,
-        CORBA::_tc_Repository,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ModuleDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ModuleDef_ptr _tao_elem
-  )
-{
-  CORBA::ModuleDef_ptr _tao_objptr =
-    CORBA::ModuleDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ModuleDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ModuleDef>::insert (
-      _tao_any,
-      CORBA::ModuleDef::_tao_any_destructor,
-      CORBA::_tc_ModuleDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ModuleDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ModuleDef>::extract (
-        _tao_any,
-        CORBA::ModuleDef::_tao_any_destructor,
-        CORBA::_tc_ModuleDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ModuleDescription &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ModuleDescription>::insert_copy (
-      _tao_any,
-      CORBA::ModuleDescription::_tao_any_destructor,
-      CORBA::_tc_ModuleDescription,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ModuleDescription *_tao_elem
-  )
-{
-  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).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ModuleDescription *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ModuleDescription *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ModuleDescription *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ModuleDescription>::extract (
-        _tao_any,
-        CORBA::ModuleDescription::_tao_any_destructor,
-        CORBA::_tc_ModuleDescription,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ConstantDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ConstantDef_ptr _tao_elem
-  )
-{
-  CORBA::ConstantDef_ptr _tao_objptr =
-    CORBA::ConstantDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ConstantDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ConstantDef>::insert (
-      _tao_any,
-      CORBA::ConstantDef::_tao_any_destructor,
-      CORBA::_tc_ConstantDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ConstantDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ConstantDef>::extract (
-        _tao_any,
-        CORBA::ConstantDef::_tao_any_destructor,
-        CORBA::_tc_ConstantDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ConstantDescription &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ConstantDescription>::insert_copy (
-      _tao_any,
-      CORBA::ConstantDescription::_tao_any_destructor,
-      CORBA::_tc_ConstantDescription,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ConstantDescription *_tao_elem
-  )
-{
-  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).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ConstantDescription *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ConstantDescription *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ConstantDescription *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ConstantDescription>::extract (
-        _tao_any,
-        CORBA::ConstantDescription::_tao_any_destructor,
-        CORBA::_tc_ConstantDescription,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::StructDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::StructDef_ptr _tao_elem
-  )
-{
-  CORBA::StructDef_ptr _tao_objptr =
-    CORBA::StructDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::StructDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::StructDef>::insert (
-      _tao_any,
-      CORBA::StructDef::_tao_any_destructor,
-      CORBA::_tc_StructDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::StructDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::StructDef>::extract (
-        _tao_any,
-        CORBA::StructDef::_tao_any_destructor,
-        CORBA::_tc_StructDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::UnionDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::UnionDef_ptr _tao_elem
-  )
-{
-  CORBA::UnionDef_ptr _tao_objptr =
-    CORBA::UnionDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::UnionDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::UnionDef>::insert (
-      _tao_any,
-      CORBA::UnionDef::_tao_any_destructor,
-      CORBA::_tc_UnionDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::UnionDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::UnionDef>::extract (
-        _tao_any,
-        CORBA::UnionDef::_tao_any_destructor,
-        CORBA::_tc_UnionDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::EnumDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::EnumDef_ptr _tao_elem
-  )
-{
-  CORBA::EnumDef_ptr _tao_objptr =
-    CORBA::EnumDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::EnumDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::EnumDef>::insert (
-      _tao_any,
-      CORBA::EnumDef::_tao_any_destructor,
-      CORBA::_tc_EnumDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::EnumDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::EnumDef>::extract (
-        _tao_any,
-        CORBA::EnumDef::_tao_any_destructor,
-        CORBA::_tc_EnumDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::AliasDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::AliasDef_ptr _tao_elem
-  )
-{
-  CORBA::AliasDef_ptr _tao_objptr =
-    CORBA::AliasDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::AliasDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::AliasDef>::insert (
-      _tao_any,
-      CORBA::AliasDef::_tao_any_destructor,
-      CORBA::_tc_AliasDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::AliasDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::AliasDef>::extract (
-        _tao_any,
-        CORBA::AliasDef::_tao_any_destructor,
-        CORBA::_tc_AliasDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::NativeDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::NativeDef_ptr _tao_elem
-  )
-{
-  CORBA::NativeDef_ptr _tao_objptr =
-    CORBA::NativeDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::NativeDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::NativeDef>::insert (
-      _tao_any,
-      CORBA::NativeDef::_tao_any_destructor,
-      CORBA::_tc_NativeDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::NativeDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::NativeDef>::extract (
-        _tao_any,
-        CORBA::NativeDef::_tao_any_destructor,
-        CORBA::_tc_NativeDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::PrimitiveDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::PrimitiveDef_ptr _tao_elem
-  )
-{
-  CORBA::PrimitiveDef_ptr _tao_objptr =
-    CORBA::PrimitiveDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::PrimitiveDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::PrimitiveDef>::insert (
-      _tao_any,
-      CORBA::PrimitiveDef::_tao_any_destructor,
-      CORBA::_tc_PrimitiveDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::PrimitiveDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::PrimitiveDef>::extract (
-        _tao_any,
-        CORBA::PrimitiveDef::_tao_any_destructor,
-        CORBA::_tc_PrimitiveDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::StringDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::StringDef_ptr _tao_elem
-  )
-{
-  CORBA::StringDef_ptr _tao_objptr =
-    CORBA::StringDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::StringDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::StringDef>::insert (
-      _tao_any,
-      CORBA::StringDef::_tao_any_destructor,
-      CORBA::_tc_StringDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::StringDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::StringDef>::extract (
-        _tao_any,
-        CORBA::StringDef::_tao_any_destructor,
-        CORBA::_tc_StringDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::WstringDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::WstringDef_ptr _tao_elem
-  )
-{
-  CORBA::WstringDef_ptr _tao_objptr =
-    CORBA::WstringDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::WstringDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::WstringDef>::insert (
-      _tao_any,
-      CORBA::WstringDef::_tao_any_destructor,
-      CORBA::_tc_WstringDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::WstringDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::WstringDef>::extract (
-        _tao_any,
-        CORBA::WstringDef::_tao_any_destructor,
-        CORBA::_tc_WstringDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::SequenceDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::SequenceDef_ptr _tao_elem
-  )
-{
-  CORBA::SequenceDef_ptr _tao_objptr =
-    CORBA::SequenceDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::SequenceDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::SequenceDef>::insert (
-      _tao_any,
-      CORBA::SequenceDef::_tao_any_destructor,
-      CORBA::_tc_SequenceDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::SequenceDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::SequenceDef>::extract (
-        _tao_any,
-        CORBA::SequenceDef::_tao_any_destructor,
-        CORBA::_tc_SequenceDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ArrayDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ArrayDef_ptr _tao_elem
-  )
-{
-  CORBA::ArrayDef_ptr _tao_objptr =
-    CORBA::ArrayDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ArrayDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ArrayDef>::insert (
-      _tao_any,
-      CORBA::ArrayDef::_tao_any_destructor,
-      CORBA::_tc_ArrayDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ArrayDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ArrayDef>::extract (
-        _tao_any,
-        CORBA::ArrayDef::_tao_any_destructor,
-        CORBA::_tc_ArrayDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ExceptionDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ExceptionDef_ptr _tao_elem
-  )
-{
-  CORBA::ExceptionDef_ptr _tao_objptr =
-    CORBA::ExceptionDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ExceptionDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ExceptionDef>::insert (
-      _tao_any,
-      CORBA::ExceptionDef::_tao_any_destructor,
-      CORBA::_tc_ExceptionDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ExceptionDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ExceptionDef>::extract (
-        _tao_any,
-        CORBA::ExceptionDef::_tao_any_destructor,
-        CORBA::_tc_ExceptionDef,
-        _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::ExceptionDefSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExceptionDefSeq>::insert_copy (
-      _tao_any,
-      CORBA::ExceptionDefSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ExceptionDefSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ExceptionDefSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExceptionDefSeq>::insert (
-      _tao_any,
-      CORBA::ExceptionDefSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ExceptionDefSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ExceptionDefSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ExceptionDefSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ExceptionDefSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ExceptionDefSeq>::extract (
-        _tao_any,
-        CORBA::ExceptionDefSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ExceptionDefSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_enum/any_op_cs.cpp:52
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::AttributeMode _tao_elem
-  )
-{
-  TAO::Any_Basic_Impl_T<CORBA::AttributeMode>::insert (
-      _tao_any,
-      CORBA::_tc_AttributeMode,
-      _tao_elem
-    );
-}
-
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::AttributeMode &_tao_elem
-  )
-{
-  return
-    TAO::Any_Basic_Impl_T<CORBA::AttributeMode>::extract (
-        _tao_any,
-        CORBA::_tc_AttributeMode,
-        _tao_elem 
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::AttributeDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::AttributeDef_ptr _tao_elem
-  )
-{
-  CORBA::AttributeDef_ptr _tao_objptr =
-    CORBA::AttributeDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::AttributeDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::AttributeDef>::insert (
-      _tao_any,
-      CORBA::AttributeDef::_tao_any_destructor,
-      CORBA::_tc_AttributeDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::AttributeDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::AttributeDef>::extract (
-        _tao_any,
-        CORBA::AttributeDef::_tao_any_destructor,
-        CORBA::_tc_AttributeDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::AttributeDescription &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::AttributeDescription>::insert_copy (
-      _tao_any,
-      CORBA::AttributeDescription::_tao_any_destructor,
-      CORBA::_tc_AttributeDescription,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::AttributeDescription *_tao_elem
-  )
-{
-  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).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::AttributeDescription *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::AttributeDescription *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::AttributeDescription *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::AttributeDescription>::extract (
-        _tao_any,
-        CORBA::AttributeDescription::_tao_any_destructor,
-        CORBA::_tc_AttributeDescription,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// 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 >>= 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
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ExtAttributeDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ExtAttributeDef_ptr _tao_elem
-  )
-{
-  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::ExtAttributeDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ExtAttributeDef>::extract (
-        _tao_any,
-        CORBA::ExtAttributeDef::_tao_any_destructor,
-        CORBA::_tc_ExtAttributeDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_enum/any_op_cs.cpp:52
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::OperationMode _tao_elem
-  )
-{
-  TAO::Any_Basic_Impl_T<CORBA::OperationMode>::insert (
-      _tao_any,
-      CORBA::_tc_OperationMode,
-      _tao_elem
-    );
-}
-
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::OperationMode &_tao_elem
-  )
-{
-  return
-    TAO::Any_Basic_Impl_T<CORBA::OperationMode>::extract (
-        _tao_any,
-        CORBA::_tc_OperationMode,
-        _tao_elem 
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ParameterDescription &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ParameterDescription>::insert_copy (
-      _tao_any,
-      CORBA::ParameterDescription::_tao_any_destructor,
-      CORBA::_tc_ParameterDescription,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ParameterDescription *_tao_elem
-  )
-{
-  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).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ParameterDescription *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ParameterDescription *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ParameterDescription *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ParameterDescription>::extract (
-        _tao_any,
-        CORBA::ParameterDescription::_tao_any_destructor,
-        CORBA::_tc_ParameterDescription,
-        _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::ParDescriptionSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ParDescriptionSeq>::insert_copy (
-      _tao_any,
-      CORBA::ParDescriptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ParDescriptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ParDescriptionSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ParDescriptionSeq>::insert (
-      _tao_any,
-      CORBA::ParDescriptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ParDescriptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ParDescriptionSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ParDescriptionSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ParDescriptionSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ParDescriptionSeq>::extract (
-        _tao_any,
-        CORBA::ParDescriptionSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ParDescriptionSeq_0,
-        _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::ContextIdSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ContextIdSeq>::insert_copy (
-      _tao_any,
-      CORBA::ContextIdSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ContextIdSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ContextIdSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ContextIdSeq>::insert (
-      _tao_any,
-      CORBA::ContextIdSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ContextIdSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ContextIdSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ContextIdSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ContextIdSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ContextIdSeq>::extract (
-        _tao_any,
-        CORBA::ContextIdSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ContextIdSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::OperationDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::OperationDef_ptr _tao_elem
-  )
-{
-  CORBA::OperationDef_ptr _tao_objptr =
-    CORBA::OperationDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::OperationDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::OperationDef>::insert (
-      _tao_any,
-      CORBA::OperationDef::_tao_any_destructor,
-      CORBA::_tc_OperationDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::OperationDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::OperationDef>::extract (
-        _tao_any,
-        CORBA::OperationDef::_tao_any_destructor,
-        CORBA::_tc_OperationDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::OperationDescription &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::OperationDescription>::insert_copy (
-      _tao_any,
-      CORBA::OperationDescription::_tao_any_destructor,
-      CORBA::_tc_OperationDescription,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::OperationDescription *_tao_elem
-  )
-{
-  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).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::OperationDescription *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::OperationDescription *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::OperationDescription *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::OperationDescription>::extract (
-        _tao_any,
-        CORBA::OperationDescription::_tao_any_destructor,
-        CORBA::_tc_OperationDescription,
-        _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::RepositoryIdSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::RepositoryIdSeq>::insert_copy (
-      _tao_any,
-      CORBA::RepositoryIdSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_RepositoryIdSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::RepositoryIdSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::RepositoryIdSeq>::insert (
-      _tao_any,
-      CORBA::RepositoryIdSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_RepositoryIdSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::RepositoryIdSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::RepositoryIdSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::RepositoryIdSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::RepositoryIdSeq>::extract (
-        _tao_any,
-        CORBA::RepositoryIdSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_RepositoryIdSeq_0,
-        _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::OpDescriptionSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::OpDescriptionSeq>::insert_copy (
-      _tao_any,
-      CORBA::OpDescriptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_OpDescriptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::OpDescriptionSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::OpDescriptionSeq>::insert (
-      _tao_any,
-      CORBA::OpDescriptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_OpDescriptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::OpDescriptionSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::OpDescriptionSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::OpDescriptionSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::OpDescriptionSeq>::extract (
-        _tao_any,
-        CORBA::OpDescriptionSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_OpDescriptionSeq_0,
-        _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::AttrDescriptionSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::AttrDescriptionSeq>::insert_copy (
-      _tao_any,
-      CORBA::AttrDescriptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_AttrDescriptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::AttrDescriptionSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::AttrDescriptionSeq>::insert (
-      _tao_any,
-      CORBA::AttrDescriptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_AttrDescriptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::AttrDescriptionSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::AttrDescriptionSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::AttrDescriptionSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::AttrDescriptionSeq>::extract (
-        _tao_any,
-        CORBA::AttrDescriptionSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_AttrDescriptionSeq_0,
-        _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::ExtAttrDescriptionSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExtAttrDescriptionSeq>::insert_copy (
-      _tao_any,
-      CORBA::ExtAttrDescriptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ExtAttrDescriptionSeq_0,
-      _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,
-      TAO::TypeCode::tc_CORBA_ExtAttrDescriptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ExtAttrDescriptionSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= 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,
-        TAO::TypeCode::tc_CORBA_ExtAttrDescriptionSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::InterfaceDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::InterfaceDef_ptr _tao_elem
-  )
-{
-  CORBA::InterfaceDef_ptr _tao_objptr =
-    CORBA::InterfaceDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::InterfaceDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::InterfaceDef>::insert (
-      _tao_any,
-      CORBA::InterfaceDef::_tao_any_destructor,
-      CORBA::_tc_InterfaceDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::InterfaceDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::InterfaceDef>::extract (
-        _tao_any,
-        CORBA::InterfaceDef::_tao_any_destructor,
-        CORBA::_tc_InterfaceDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::InterfaceDef::FullInterfaceDescription &_tao_elem
-  )
-{
-  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.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::InterfaceDef::FullInterfaceDescription *_tao_elem
-  )
-{
-  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).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::InterfaceDef::FullInterfaceDescription *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::InterfaceDef::FullInterfaceDescription *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::InterfaceDef::FullInterfaceDescription *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::InterfaceDef::FullInterfaceDescription>::extract (
-        _tao_any,
-        CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor,
-        CORBA::InterfaceDef::_tc_FullInterfaceDescription,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::InterfaceDescription &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::InterfaceDescription>::insert_copy (
-      _tao_any,
-      CORBA::InterfaceDescription::_tao_any_destructor,
-      CORBA::_tc_InterfaceDescription,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::InterfaceDescription *_tao_elem
-  )
-{
-  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).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::InterfaceDescription *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::InterfaceDescription *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::InterfaceDescription *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::InterfaceDescription>::extract (
-        _tao_any,
-        CORBA::InterfaceDescription::_tao_any_destructor,
-        CORBA::_tc_InterfaceDescription,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::InterfaceAttrExtension>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// 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
-      );
-}
-
-// TAO_IDL - Generated from 
-// 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 >>= 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
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ExtInterfaceDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// 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
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::AbstractInterfaceDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::AbstractInterfaceDef_ptr _tao_elem
-  )
-{
-  CORBA::AbstractInterfaceDef_ptr _tao_objptr =
-    CORBA::AbstractInterfaceDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::AbstractInterfaceDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::AbstractInterfaceDef>::insert (
-      _tao_any,
-      CORBA::AbstractInterfaceDef::_tao_any_destructor,
-      CORBA::_tc_AbstractInterfaceDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::AbstractInterfaceDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::AbstractInterfaceDef>::extract (
-        _tao_any,
-        CORBA::AbstractInterfaceDef::_tao_any_destructor,
-        CORBA::_tc_AbstractInterfaceDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ExtAbstractInterfaceDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// 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
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::LocalInterfaceDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::LocalInterfaceDef_ptr _tao_elem
-  )
-{
-  CORBA::LocalInterfaceDef_ptr _tao_objptr =
-    CORBA::LocalInterfaceDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::LocalInterfaceDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::LocalInterfaceDef>::insert (
-      _tao_any,
-      CORBA::LocalInterfaceDef::_tao_any_destructor,
-      CORBA::_tc_LocalInterfaceDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::LocalInterfaceDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::LocalInterfaceDef>::extract (
-        _tao_any,
-        CORBA::LocalInterfaceDef::_tao_any_destructor,
-        CORBA::_tc_LocalInterfaceDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ExtLocalInterfaceDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// 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
-      );
-}
diff --git a/TAO/tao/DynamicS.h b/TAO/tao/IFR_Client/IFR_BasicA.h
index 17b1360599e..f79b2d40fc4 100644
--- a/TAO/tao/DynamicS.h
+++ b/TAO/tao/IFR_Client/IFR_BasicA.h
@@ -25,4 +25,20 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-// Skeleton file generation suppressed with command line option -SS
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:390
+
+#ifndef _TAO_IDL_ORIG_IFR_BASICA_H_
+#define _TAO_IDL_ORIG_IFR_BASICA_H_
+
+#include /**/ "ace/pre.h"
+
+#include "tao/IFR_Client/IFR_BasicC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "ace/post.h"
+#endif /* ifndef */
+
diff --git a/TAO/tao/IFR_Client/IFR_BasicC.cpp b/TAO/tao/IFR_Client/IFR_BasicC.cpp
index 30d2cbf70ba..e9b3916a962 100644
--- a/TAO/tao/IFR_Client/IFR_BasicC.cpp
+++ b/TAO/tao/IFR_Client/IFR_BasicC.cpp
@@ -26,20 +26,35 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:293
 
 
 #include "IFR_BasicC.h"
 #include "tao/CDR.h"
-#include "tao/Exception_Data.h"
+#include "tao/IFR_Client/IFR_BaseC.h"
+#include "tao/AnyTypeCode/orb_typesA.h"
+#include "tao/AnyTypeCode/ParameterModeA.h"
 #include "tao/Invocation_Adapter.h"
 #include "tao/Object_T.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Enum_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Sequence_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
+#include "tao/AnyTypeCode/Recursive_Type_TypeCode.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Basic_Impl_T.h"
 #include "tao/Basic_Arguments.h"
 #include "tao/Object_Argument_T.h"
 #include "tao/Special_Basic_Arguments.h"
 #include "tao/UB_String_Arguments.h"
 #include "tao/Var_Size_Argument_T.h"
-#include "tao/Any_Arg_Traits.h"
+#include "tao/AnyTypeCode/Any_Arg_Traits.h"
 #include "ace/OS_NS_string.h"
 
 #if defined (__BORLANDC__)
@@ -51,15 +66,18 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
 {
 
-#if !defined (_CORBA_CONTAINED__ARG_TRAITS_CS_)
-#define _CORBA_CONTAINED__ARG_TRAITS_CS_
-  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
+
+#if !defined (_CORBA_CONTAINED__ARG_TRAITS_)
+#define _CORBA_CONTAINED__ARG_TRAITS_
+
   template<>
   class  Arg_Traits<CORBA::Contained>
     : public
@@ -67,16 +85,20 @@ namespace TAO
             CORBA::Contained_ptr,
             CORBA::Contained_var,
             CORBA::Contained_out,
-            TAO::Objref_Traits<CORBA::Contained>
+            TAO::Objref_Traits<CORBA::Contained>,
+            TAO::Any_Insert_Policy_Stream <CORBA::Contained_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_IDLTYPE__ARG_TRAITS_CS_)
-#define _CORBA_IDLTYPE__ARG_TRAITS_CS_
-  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
+
+#if !defined (_CORBA_IDLTYPE__ARG_TRAITS_)
+#define _CORBA_IDLTYPE__ARG_TRAITS_
+
   template<>
   class  Arg_Traits<CORBA::IDLType>
     : public
@@ -84,130 +106,140 @@ namespace TAO
             CORBA::IDLType_ptr,
             CORBA::IDLType_var,
             CORBA::IDLType_out,
-            TAO::Objref_Traits<CORBA::IDLType>
+            TAO::Objref_Traits<CORBA::IDLType>,
+            TAO::Any_Insert_Policy_Stream <CORBA::IDLType_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:751
+  // be\be_visitor_arg_traits.cpp:828
+
+#if !defined (_CORBA_INTERFACEDEF_FULLINTERFACEDESCRIPTION__ARG_TRAITS_)
+#define _CORBA_INTERFACEDEF_FULLINTERFACEDESCRIPTION__ARG_TRAITS_
 
-#if !defined (_CORBA_INTERFACEDEF_FULLINTERFACEDESCRIPTION__ARG_TRAITS_CS_)
-#define _CORBA_INTERFACEDEF_FULLINTERFACEDESCRIPTION__ARG_TRAITS_CS_
-  
   template<>
   class Arg_Traits<CORBA::InterfaceDef::FullInterfaceDescription>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::InterfaceDef::FullInterfaceDescription,
             CORBA::InterfaceDef::FullInterfaceDescription_var,
-            CORBA::InterfaceDef::FullInterfaceDescription_out
+            CORBA::InterfaceDef::FullInterfaceDescription_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::InterfaceDef::FullInterfaceDescription>
           >
   {
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
+
+#if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_)
+#define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_
 
-#if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_CS_)
-#define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_CS_
-  
   template<>
   class Arg_Traits<CORBA::InterfaceDefSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::InterfaceDefSeq,
             CORBA::InterfaceDefSeq_var,
-            CORBA::InterfaceDefSeq_out
+            CORBA::InterfaceDefSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::InterfaceDefSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
+
+#if !defined (_CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_)
+#define _CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_
 
-#if !defined (_CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_CS_)
-#define _CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_CS_
-  
   template<>
   class Arg_Traits<CORBA::StructMemberSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::StructMemberSeq,
             CORBA::StructMemberSeq_var,
-            CORBA::StructMemberSeq_out
+            CORBA::StructMemberSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::StructMemberSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
+
+#if !defined (_CORBA_EXCDESCRIPTIONSEQ__ARG_TRAITS_)
+#define _CORBA_EXCDESCRIPTIONSEQ__ARG_TRAITS_
 
-#if !defined (_CORBA_EXCDESCRIPTIONSEQ__ARG_TRAITS_CS_)
-#define _CORBA_EXCDESCRIPTIONSEQ__ARG_TRAITS_CS_
-  
   template<>
   class Arg_Traits<CORBA::ExcDescriptionSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ExcDescriptionSeq,
             CORBA::ExcDescriptionSeq_var,
-            CORBA::ExcDescriptionSeq_out
+            CORBA::ExcDescriptionSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ExcDescriptionSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
+
+#if !defined (_CORBA_UNIONMEMBERSEQ__ARG_TRAITS_)
+#define _CORBA_UNIONMEMBERSEQ__ARG_TRAITS_
 
-#if !defined (_CORBA_UNIONMEMBERSEQ__ARG_TRAITS_CS_)
-#define _CORBA_UNIONMEMBERSEQ__ARG_TRAITS_CS_
-  
   template<>
   class Arg_Traits<CORBA::UnionMemberSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::UnionMemberSeq,
             CORBA::UnionMemberSeq_var,
-            CORBA::UnionMemberSeq_out
+            CORBA::UnionMemberSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::UnionMemberSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
+
+#if !defined (_CORBA_ENUMMEMBERSEQ__ARG_TRAITS_)
+#define _CORBA_ENUMMEMBERSEQ__ARG_TRAITS_
 
-#if !defined (_CORBA_ENUMMEMBERSEQ__ARG_TRAITS_CS_)
-#define _CORBA_ENUMMEMBERSEQ__ARG_TRAITS_CS_
-  
   template<>
   class Arg_Traits<CORBA::EnumMemberSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::EnumMemberSeq,
             CORBA::EnumMemberSeq_var,
-            CORBA::EnumMemberSeq_out
+            CORBA::EnumMemberSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::EnumMemberSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_PRIMITIVEDEF__ARG_TRAITS_CS_)
-#define _CORBA_PRIMITIVEDEF__ARG_TRAITS_CS_
-  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
+
+#if !defined (_CORBA_PRIMITIVEDEF__ARG_TRAITS_)
+#define _CORBA_PRIMITIVEDEF__ARG_TRAITS_
+
   template<>
   class  Arg_Traits<CORBA::PrimitiveDef>
     : public
@@ -215,16 +247,20 @@ namespace TAO
             CORBA::PrimitiveDef_ptr,
             CORBA::PrimitiveDef_var,
             CORBA::PrimitiveDef_out,
-            TAO::Objref_Traits<CORBA::PrimitiveDef>
+            TAO::Objref_Traits<CORBA::PrimitiveDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::PrimitiveDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_STRINGDEF__ARG_TRAITS_CS_)
-#define _CORBA_STRINGDEF__ARG_TRAITS_CS_
-  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
+
+#if !defined (_CORBA_STRINGDEF__ARG_TRAITS_)
+#define _CORBA_STRINGDEF__ARG_TRAITS_
+
   template<>
   class  Arg_Traits<CORBA::StringDef>
     : public
@@ -232,16 +268,20 @@ namespace TAO
             CORBA::StringDef_ptr,
             CORBA::StringDef_var,
             CORBA::StringDef_out,
-            TAO::Objref_Traits<CORBA::StringDef>
+            TAO::Objref_Traits<CORBA::StringDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::StringDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_SEQUENCEDEF__ARG_TRAITS_CS_)
-#define _CORBA_SEQUENCEDEF__ARG_TRAITS_CS_
-  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
+
+#if !defined (_CORBA_SEQUENCEDEF__ARG_TRAITS_)
+#define _CORBA_SEQUENCEDEF__ARG_TRAITS_
+
   template<>
   class  Arg_Traits<CORBA::SequenceDef>
     : public
@@ -249,16 +289,20 @@ namespace TAO
             CORBA::SequenceDef_ptr,
             CORBA::SequenceDef_var,
             CORBA::SequenceDef_out,
-            TAO::Objref_Traits<CORBA::SequenceDef>
+            TAO::Objref_Traits<CORBA::SequenceDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::SequenceDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_ARRAYDEF__ARG_TRAITS_CS_)
-#define _CORBA_ARRAYDEF__ARG_TRAITS_CS_
-  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
+
+#if !defined (_CORBA_ARRAYDEF__ARG_TRAITS_)
+#define _CORBA_ARRAYDEF__ARG_TRAITS_
+
   template<>
   class  Arg_Traits<CORBA::ArrayDef>
     : public
@@ -266,16 +310,20 @@ namespace TAO
             CORBA::ArrayDef_ptr,
             CORBA::ArrayDef_var,
             CORBA::ArrayDef_out,
-            TAO::Objref_Traits<CORBA::ArrayDef>
+            TAO::Objref_Traits<CORBA::ArrayDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ArrayDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_WSTRINGDEF__ARG_TRAITS_CS_)
-#define _CORBA_WSTRINGDEF__ARG_TRAITS_CS_
-  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
+
+#if !defined (_CORBA_WSTRINGDEF__ARG_TRAITS_)
+#define _CORBA_WSTRINGDEF__ARG_TRAITS_
+
   template<>
   class  Arg_Traits<CORBA::WstringDef>
     : public
@@ -283,16 +331,20 @@ namespace TAO
             CORBA::WstringDef_ptr,
             CORBA::WstringDef_var,
             CORBA::WstringDef_out,
-            TAO::Objref_Traits<CORBA::WstringDef>
+            TAO::Objref_Traits<CORBA::WstringDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::WstringDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_FIXEDDEF__ARG_TRAITS_CS_)
-#define _CORBA_FIXEDDEF__ARG_TRAITS_CS_
-  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
+
+#if !defined (_CORBA_FIXEDDEF__ARG_TRAITS_)
+#define _CORBA_FIXEDDEF__ARG_TRAITS_
+
   template<>
   class  Arg_Traits<CORBA::FixedDef>
     : public
@@ -300,69 +352,76 @@ namespace TAO
             CORBA::FixedDef_ptr,
             CORBA::FixedDef_var,
             CORBA::FixedDef_out,
-            TAO::Objref_Traits<CORBA::FixedDef>
+            TAO::Objref_Traits<CORBA::FixedDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::FixedDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:709
+  // be\be_visitor_arg_traits.cpp:786
+
+#if !defined (_CORBA_PRIMITIVEKIND__ARG_TRAITS_)
+#define _CORBA_PRIMITIVEKIND__ARG_TRAITS_
 
-#if !defined (_CORBA_PRIMITIVEKIND__ARG_TRAITS_CS_)
-#define _CORBA_PRIMITIVEKIND__ARG_TRAITS_CS_
-  
   template<>
   class Arg_Traits<CORBA::PrimitiveKind>
     : public
         Basic_Arg_Traits_T<
-            CORBA::PrimitiveKind
+            CORBA::PrimitiveKind,
+            TAO::Any_Insert_Policy_Stream <CORBA::PrimitiveKind>
           >
   {
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
+
+#if !defined (_CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_)
+#define _CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_
 
-#if !defined (_CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_CS_)
-#define _CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_CS_
-  
   template<>
   class Arg_Traits<CORBA::ExceptionDefSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ExceptionDefSeq,
             CORBA::ExceptionDefSeq_var,
-            CORBA::ExceptionDefSeq_out
+            CORBA::ExceptionDefSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ExceptionDefSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:709
+  // be\be_visitor_arg_traits.cpp:786
+
+#if !defined (_CORBA_ATTRIBUTEMODE__ARG_TRAITS_)
+#define _CORBA_ATTRIBUTEMODE__ARG_TRAITS_
 
-#if !defined (_CORBA_ATTRIBUTEMODE__ARG_TRAITS_CS_)
-#define _CORBA_ATTRIBUTEMODE__ARG_TRAITS_CS_
-  
   template<>
   class Arg_Traits<CORBA::AttributeMode>
     : public
         Basic_Arg_Traits_T<
-            CORBA::AttributeMode
+            CORBA::AttributeMode,
+            TAO::Any_Insert_Policy_Stream <CORBA::AttributeMode>
           >
   {
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_ATTRIBUTEDEF__ARG_TRAITS_CS_)
-#define _CORBA_ATTRIBUTEDEF__ARG_TRAITS_CS_
-  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
+
+#if !defined (_CORBA_ATTRIBUTEDEF__ARG_TRAITS_)
+#define _CORBA_ATTRIBUTEDEF__ARG_TRAITS_
+
   template<>
   class  Arg_Traits<CORBA::AttributeDef>
     : public
@@ -370,35 +429,40 @@ namespace TAO
             CORBA::AttributeDef_ptr,
             CORBA::AttributeDef_var,
             CORBA::AttributeDef_out,
-            TAO::Objref_Traits<CORBA::AttributeDef>
+            TAO::Objref_Traits<CORBA::AttributeDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::AttributeDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:751
+  // be\be_visitor_arg_traits.cpp:828
+
+#if !defined (_CORBA_EXTATTRIBUTEDESCRIPTION__ARG_TRAITS_)
+#define _CORBA_EXTATTRIBUTEDESCRIPTION__ARG_TRAITS_
 
-#if !defined (_CORBA_EXTATTRIBUTEDESCRIPTION__ARG_TRAITS_CS_)
-#define _CORBA_EXTATTRIBUTEDESCRIPTION__ARG_TRAITS_CS_
-  
   template<>
   class Arg_Traits<CORBA::ExtAttributeDescription>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ExtAttributeDescription,
             CORBA::ExtAttributeDescription_var,
-            CORBA::ExtAttributeDescription_out
+            CORBA::ExtAttributeDescription_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ExtAttributeDescription>
           >
   {
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_EXTATTRIBUTEDEF__ARG_TRAITS_CS_)
-#define _CORBA_EXTATTRIBUTEDEF__ARG_TRAITS_CS_
-  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
+
+#if !defined (_CORBA_EXTATTRIBUTEDEF__ARG_TRAITS_)
+#define _CORBA_EXTATTRIBUTEDEF__ARG_TRAITS_
+
   template<>
   class  Arg_Traits<CORBA::ExtAttributeDef>
     : public
@@ -406,71 +470,78 @@ namespace TAO
             CORBA::ExtAttributeDef_ptr,
             CORBA::ExtAttributeDef_var,
             CORBA::ExtAttributeDef_out,
-            TAO::Objref_Traits<CORBA::ExtAttributeDef>
+            TAO::Objref_Traits<CORBA::ExtAttributeDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ExtAttributeDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:709
+  // be\be_visitor_arg_traits.cpp:786
+
+#if !defined (_CORBA_OPERATIONMODE__ARG_TRAITS_)
+#define _CORBA_OPERATIONMODE__ARG_TRAITS_
 
-#if !defined (_CORBA_OPERATIONMODE__ARG_TRAITS_CS_)
-#define _CORBA_OPERATIONMODE__ARG_TRAITS_CS_
-  
   template<>
   class Arg_Traits<CORBA::OperationMode>
     : public
         Basic_Arg_Traits_T<
-            CORBA::OperationMode
+            CORBA::OperationMode,
+            TAO::Any_Insert_Policy_Stream <CORBA::OperationMode>
           >
   {
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
+
+#if !defined (_CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_)
+#define _CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_
 
-#if !defined (_CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_CS_)
-#define _CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_CS_
-  
   template<>
   class Arg_Traits<CORBA::ParDescriptionSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ParDescriptionSeq,
             CORBA::ParDescriptionSeq_var,
-            CORBA::ParDescriptionSeq_out
+            CORBA::ParDescriptionSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ParDescriptionSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
+
+#if !defined (_CORBA_CONTEXTIDSEQ__ARG_TRAITS_)
+#define _CORBA_CONTEXTIDSEQ__ARG_TRAITS_
 
-#if !defined (_CORBA_CONTEXTIDSEQ__ARG_TRAITS_CS_)
-#define _CORBA_CONTEXTIDSEQ__ARG_TRAITS_CS_
-  
   template<>
   class Arg_Traits<CORBA::ContextIdSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ContextIdSeq,
             CORBA::ContextIdSeq_var,
-            CORBA::ContextIdSeq_out
+            CORBA::ContextIdSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ContextIdSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_OPERATIONDEF__ARG_TRAITS_CS_)
-#define _CORBA_OPERATIONDEF__ARG_TRAITS_CS_
-  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
+
+#if !defined (_CORBA_OPERATIONDEF__ARG_TRAITS_)
+#define _CORBA_OPERATIONDEF__ARG_TRAITS_
+
   template<>
   class  Arg_Traits<CORBA::OperationDef>
     : public
@@ -478,26 +549,28 @@ namespace TAO
             CORBA::OperationDef_ptr,
             CORBA::OperationDef_var,
             CORBA::OperationDef_out,
-            TAO::Objref_Traits<CORBA::OperationDef>
+            TAO::Objref_Traits<CORBA::OperationDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::OperationDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:751
+  // be\be_visitor_arg_traits.cpp:828
+
+#if !defined (_CORBA_INTERFACEATTREXTENSION_EXTFULLINTERFACEDESCRIPTION__ARG_TRAITS_)
+#define _CORBA_INTERFACEATTREXTENSION_EXTFULLINTERFACEDESCRIPTION__ARG_TRAITS_
 
-#if !defined (_CORBA_INTERFACEATTREXTENSION_EXTFULLINTERFACEDESCRIPTION__ARG_TRAITS_CS_)
-#define _CORBA_INTERFACEATTREXTENSION_EXTFULLINTERFACEDESCRIPTION__ARG_TRAITS_CS_
-  
   template<>
   class Arg_Traits<CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription,
             CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var,
-            CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_out
+            CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>
           >
   {
   };
@@ -507,6 +580,53 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/enum_typecode.cpp:34
+
+static char const * const _tao_enumerators_CORBA_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"
+
+  };
+
+static TAO::TypeCode::Enum<char const *,
+                           char const * const *,
+                           TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_PrimitiveKind (
+    "IDL:omg.org/CORBA/PrimitiveKind:1.0",
+    "PrimitiveKind",
+    _tao_enumerators_CORBA_PrimitiveKind,
+    22);
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_PrimitiveKind =
+    &_tao_tc_CORBA_PrimitiveKind;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::Repository.
@@ -543,7 +663,7 @@ TAO::Objref_Traits<CORBA::Repository>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_Repository_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -563,21 +683,21 @@ TAO::Collocation_Proxy_Broker *
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Repository_Proxy_Broker_ == 0)
     {
       CORBA_Repository_setup_collocation ();
     }
-  
-  TAO::Arg_Traits< CORBA::Contained>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_search_id (search_id);
-  
+
+  TAO::Arg_Traits< ::CORBA::Contained>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_search_id (search_id);
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_search_id
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -586,10 +706,10 @@ TAO::Collocation_Proxy_Broker *
       9,
       this->the_TAO_Repository_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -608,21 +728,21 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Repository_Proxy_Broker_ == 0)
     {
       CORBA_Repository_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::TypeCode>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::TypeCode>::in_arg_val _tao_tc (tc);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_tc
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -631,10 +751,10 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
       22,
       this->the_TAO_Repository_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -653,21 +773,21 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Repository_Proxy_Broker_ == 0)
     {
       CORBA_Repository_setup_collocation ();
     }
-  
-  TAO::Arg_Traits< CORBA::PrimitiveDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::PrimitiveKind>::in_arg_val _tao_kind (kind);
-  
+
+  TAO::Arg_Traits< ::CORBA::PrimitiveDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::PrimitiveKind>::in_arg_val _tao_kind (kind);
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_kind
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -676,10 +796,10 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
       13,
       this->the_TAO_Repository_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -698,21 +818,21 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Repository_Proxy_Broker_ == 0)
     {
       CORBA_Repository_setup_collocation ();
     }
-  
-  TAO::Arg_Traits< CORBA::StringDef>::ret_val _tao_retval;
+
+  TAO::Arg_Traits< ::CORBA::StringDef>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::ULong>::in_arg_val _tao_bound (bound);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_bound
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -721,10 +841,10 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
       13,
       this->the_TAO_Repository_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -743,21 +863,21 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Repository_Proxy_Broker_ == 0)
     {
       CORBA_Repository_setup_collocation ();
     }
-  
-  TAO::Arg_Traits< CORBA::WstringDef>::ret_val _tao_retval;
+
+  TAO::Arg_Traits< ::CORBA::WstringDef>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::ULong>::in_arg_val _tao_bound (bound);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_bound
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -766,10 +886,10 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
       14,
       this->the_TAO_Repository_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -789,23 +909,23 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Repository_Proxy_Broker_ == 0)
     {
       CORBA_Repository_setup_collocation ();
     }
-  
-  TAO::Arg_Traits< CORBA::SequenceDef>::ret_val _tao_retval;
+
+  TAO::Arg_Traits< ::CORBA::SequenceDef>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::ULong>::in_arg_val _tao_bound (bound);
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_element_type (element_type);
-  
+  TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_element_type (element_type);
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_bound,
       &_tao_element_type
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -814,10 +934,10 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
       15,
       this->the_TAO_Repository_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -837,23 +957,23 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Repository_Proxy_Broker_ == 0)
     {
       CORBA_Repository_setup_collocation ();
     }
-  
-  TAO::Arg_Traits< CORBA::ArrayDef>::ret_val _tao_retval;
+
+  TAO::Arg_Traits< ::CORBA::ArrayDef>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::ULong>::in_arg_val _tao_length (length);
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_element_type (element_type);
-  
+  TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_element_type (element_type);
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_length,
       &_tao_element_type
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -862,10 +982,10 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
       12,
       this->the_TAO_Repository_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -885,23 +1005,23 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Repository_Proxy_Broker_ == 0)
     {
       CORBA_Repository_setup_collocation ();
     }
-  
-  TAO::Arg_Traits< CORBA::FixedDef>::ret_val _tao_retval;
+
+  TAO::Arg_Traits< ::CORBA::FixedDef>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::UShort>::in_arg_val _tao_digits (digits);
   TAO::Arg_Traits< ::CORBA::Short>::in_arg_val _tao_scale (scale);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_digits,
       &_tao_scale
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -910,10 +1030,10 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
       12,
       this->the_TAO_Repository_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -931,14 +1051,14 @@ CORBA::Repository::CORBA_Repository_setup_collocation ()
       this->the_TAO_Repository_Proxy_Broker_ =
         ::CORBA__TAO_Repository_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_Container_setup_collocation ();
 }
 
 CORBA::Repository::~Repository (void)
 {}
 
-void 
+void
 CORBA::Repository::_tao_any_destructor (void *_tao_void_pointer)
 {
   Repository *_tao_tmp_pointer =
@@ -983,7 +1103,7 @@ CORBA::Repository::_duplicate (Repository_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -1041,6 +1161,24 @@ CORBA::Repository::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_Repository (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/Repository:1.0",
+    "Repository");
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_Repository =
+    &_tao_tc_CORBA_Repository;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::ModuleDef.
@@ -1077,7 +1215,7 @@ TAO::Objref_Traits<CORBA::ModuleDef>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -1096,7 +1234,7 @@ CORBA::ModuleDef::CORBA_ModuleDef_setup_collocation ()
       this->the_TAO_ModuleDef_Proxy_Broker_ =
         ::CORBA__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_Container_setup_collocation ();
   this->CORBA_Contained_setup_collocation ();
 }
@@ -1104,7 +1242,7 @@ CORBA::ModuleDef::CORBA_ModuleDef_setup_collocation ()
 CORBA::ModuleDef::~ModuleDef (void)
 {}
 
-void 
+void
 CORBA::ModuleDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ModuleDef *_tao_tmp_pointer =
@@ -1149,7 +1287,7 @@ CORBA::ModuleDef::_duplicate (ModuleDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -1210,10 +1348,58 @@ CORBA::ModuleDef::marshal (TAO_OutputCDR &cdr)
   return (cdr << this);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ModuleDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/ModuleDef:1.0",
+    "ModuleDef");
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ModuleDef =
+    &_tao_tc_CORBA_ModuleDef;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ModuleDescription[] =
+  {
+    { "name", &CORBA::_tc_Identifier },
+    { "id", &CORBA::_tc_RepositoryId },
+    { "defined_in", &CORBA::_tc_RepositoryId },
+    { "version", &CORBA::_tc_VersionSpec }
+
+  };
+static TAO::TypeCode::Struct<char const *,
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ModuleDescription (
+    CORBA::tk_struct,
+    "IDL:omg.org/CORBA/ModuleDescription:1.0",
+    "ModuleDescription",
+    _tao_fields_CORBA_ModuleDescription,
+    4);
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ModuleDescription =
+    &_tao_tc_CORBA_ModuleDescription;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 CORBA::ModuleDescription::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -1260,7 +1446,7 @@ TAO::Objref_Traits<CORBA::ConstantDef>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_ConstantDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -1279,19 +1465,19 @@ CORBA::TypeCode_ptr CORBA::ConstantDef::type (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ConstantDef_Proxy_Broker_ == 0)
     {
       CORBA_ConstantDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::TypeCode>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1300,10 +1486,10 @@ CORBA::TypeCode_ptr CORBA::ConstantDef::type (
       9,
       this->the_TAO_ConstantDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -1321,19 +1507,19 @@ CORBA::TypeCode_ptr CORBA::ConstantDef::type (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ConstantDef_Proxy_Broker_ == 0)
     {
       CORBA_ConstantDef_setup_collocation ();
     }
-  
-  TAO::Arg_Traits< CORBA::IDLType>::ret_val _tao_retval;
-  
+
+  TAO::Arg_Traits< ::CORBA::IDLType>::ret_val _tao_retval;
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1342,10 +1528,10 @@ CORBA::TypeCode_ptr CORBA::ConstantDef::type (
       13,
       this->the_TAO_ConstantDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -1364,21 +1550,21 @@ void CORBA::ConstantDef::type_def (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ConstantDef_Proxy_Broker_ == 0)
     {
       CORBA_ConstantDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_type_def (type_def);
-  
+  TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type_def (type_def);
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_type_def
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1387,7 +1573,7 @@ void CORBA::ConstantDef::type_def (
       13,
       this->the_TAO_ConstantDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -1406,19 +1592,19 @@ CORBA::Any * CORBA::ConstantDef::value (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ConstantDef_Proxy_Broker_ == 0)
     {
       CORBA_ConstantDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::Any>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1427,10 +1613,10 @@ CORBA::Any * CORBA::ConstantDef::value (
       10,
       this->the_TAO_ConstantDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -1449,21 +1635,21 @@ void CORBA::ConstantDef::value (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ConstantDef_Proxy_Broker_ == 0)
     {
       CORBA_ConstantDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Any>::in_arg_val _tao_value (value);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_value
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1472,7 +1658,7 @@ void CORBA::ConstantDef::value (
       10,
       this->the_TAO_ConstantDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -1491,14 +1677,14 @@ CORBA::ConstantDef::CORBA_ConstantDef_setup_collocation ()
       this->the_TAO_ConstantDef_Proxy_Broker_ =
         ::CORBA__TAO_ConstantDef_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_Contained_setup_collocation ();
 }
 
 CORBA::ConstantDef::~ConstantDef (void)
 {}
 
-void 
+void
 CORBA::ConstantDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ConstantDef *_tao_tmp_pointer =
@@ -1543,7 +1729,7 @@ CORBA::ConstantDef::_duplicate (ConstantDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -1600,10 +1786,60 @@ CORBA::ConstantDef::marshal (TAO_OutputCDR &cdr)
   return (cdr << this);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ConstantDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/ConstantDef:1.0",
+    "ConstantDef");
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ConstantDef =
+    &_tao_tc_CORBA_ConstantDef;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ConstantDescription[] =
+  {
+    { "name", &CORBA::_tc_Identifier },
+    { "id", &CORBA::_tc_RepositoryId },
+    { "defined_in", &CORBA::_tc_RepositoryId },
+    { "version", &CORBA::_tc_VersionSpec },
+    { "type", &CORBA::_tc_TypeCode },
+    { "value", &CORBA::_tc_any }
+
+  };
+static TAO::TypeCode::Struct<char const *,
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ConstantDescription (
+    CORBA::tk_struct,
+    "IDL:omg.org/CORBA/ConstantDescription:1.0",
+    "ConstantDescription",
+    _tao_fields_CORBA_ConstantDescription,
+    6);
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ConstantDescription =
+    &_tao_tc_CORBA_ConstantDescription;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 CORBA::ConstantDescription::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -1650,7 +1886,7 @@ TAO::Objref_Traits<CORBA::StructDef>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_StructDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -1669,19 +1905,19 @@ TAO::Collocation_Proxy_Broker *
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_StructDef_Proxy_Broker_ == 0)
     {
       CORBA_StructDef_setup_collocation ();
     }
-  
-  TAO::Arg_Traits< CORBA::StructMemberSeq>::ret_val _tao_retval;
-  
+
+  TAO::Arg_Traits< ::CORBA::StructMemberSeq>::ret_val _tao_retval;
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1690,10 +1926,10 @@ TAO::Collocation_Proxy_Broker *
       12,
       this->the_TAO_StructDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -1712,21 +1948,21 @@ void CORBA::StructDef::members (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_StructDef_Proxy_Broker_ == 0)
     {
       CORBA_StructDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::StructMemberSeq>::in_arg_val _tao_members (members);
-  
+  TAO::Arg_Traits< ::CORBA::StructMemberSeq>::in_arg_val _tao_members (members);
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_members
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1735,7 +1971,7 @@ void CORBA::StructDef::members (
       12,
       this->the_TAO_StructDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -1754,7 +1990,7 @@ CORBA::StructDef::CORBA_StructDef_setup_collocation ()
       this->the_TAO_StructDef_Proxy_Broker_ =
         ::CORBA__TAO_StructDef_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_TypedefDef_setup_collocation ();
   this->CORBA_Container_setup_collocation ();
 }
@@ -1762,7 +1998,7 @@ CORBA::StructDef::CORBA_StructDef_setup_collocation ()
 CORBA::StructDef::~StructDef (void)
 {}
 
-void 
+void
 CORBA::StructDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   StructDef *_tao_tmp_pointer =
@@ -1807,7 +2043,7 @@ CORBA::StructDef::_duplicate (StructDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -1877,6 +2113,24 @@ CORBA::StructDef::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_StructDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/StructDef:1.0",
+    "StructDef");
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_StructDef =
+    &_tao_tc_CORBA_StructDef;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::UnionDef.
@@ -1913,7 +2167,7 @@ TAO::Objref_Traits<CORBA::UnionDef>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_UnionDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -1932,19 +2186,19 @@ CORBA::TypeCode_ptr CORBA::UnionDef::discriminator_type (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_UnionDef_Proxy_Broker_ == 0)
     {
       CORBA_UnionDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::TypeCode>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1953,10 +2207,10 @@ CORBA::TypeCode_ptr CORBA::UnionDef::discriminator_type (
       23,
       this->the_TAO_UnionDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -1974,19 +2228,19 @@ CORBA::TypeCode_ptr CORBA::UnionDef::discriminator_type (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_UnionDef_Proxy_Broker_ == 0)
     {
       CORBA_UnionDef_setup_collocation ();
     }
-  
-  TAO::Arg_Traits< CORBA::IDLType>::ret_val _tao_retval;
-  
+
+  TAO::Arg_Traits< ::CORBA::IDLType>::ret_val _tao_retval;
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1995,10 +2249,10 @@ CORBA::TypeCode_ptr CORBA::UnionDef::discriminator_type (
       27,
       this->the_TAO_UnionDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -2017,21 +2271,21 @@ void CORBA::UnionDef::discriminator_type_def (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_UnionDef_Proxy_Broker_ == 0)
     {
       CORBA_UnionDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_discriminator_type_def (discriminator_type_def);
-  
+  TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_discriminator_type_def (discriminator_type_def);
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_discriminator_type_def
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -2040,7 +2294,7 @@ void CORBA::UnionDef::discriminator_type_def (
       27,
       this->the_TAO_UnionDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -2059,19 +2313,19 @@ void CORBA::UnionDef::discriminator_type_def (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_UnionDef_Proxy_Broker_ == 0)
     {
       CORBA_UnionDef_setup_collocation ();
     }
-  
-  TAO::Arg_Traits< CORBA::UnionMemberSeq>::ret_val _tao_retval;
-  
+
+  TAO::Arg_Traits< ::CORBA::UnionMemberSeq>::ret_val _tao_retval;
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -2080,10 +2334,10 @@ void CORBA::UnionDef::discriminator_type_def (
       12,
       this->the_TAO_UnionDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -2102,21 +2356,21 @@ void CORBA::UnionDef::members (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_UnionDef_Proxy_Broker_ == 0)
     {
       CORBA_UnionDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::UnionMemberSeq>::in_arg_val _tao_members (members);
-  
+  TAO::Arg_Traits< ::CORBA::UnionMemberSeq>::in_arg_val _tao_members (members);
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_members
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -2125,7 +2379,7 @@ void CORBA::UnionDef::members (
       12,
       this->the_TAO_UnionDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -2144,7 +2398,7 @@ CORBA::UnionDef::CORBA_UnionDef_setup_collocation ()
       this->the_TAO_UnionDef_Proxy_Broker_ =
         ::CORBA__TAO_UnionDef_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_TypedefDef_setup_collocation ();
   this->CORBA_Container_setup_collocation ();
 }
@@ -2152,7 +2406,7 @@ CORBA::UnionDef::CORBA_UnionDef_setup_collocation ()
 CORBA::UnionDef::~UnionDef (void)
 {}
 
-void 
+void
 CORBA::UnionDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   UnionDef *_tao_tmp_pointer =
@@ -2197,7 +2451,7 @@ CORBA::UnionDef::_duplicate (UnionDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -2267,6 +2521,24 @@ CORBA::UnionDef::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_UnionDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/UnionDef:1.0",
+    "UnionDef");
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_UnionDef =
+    &_tao_tc_CORBA_UnionDef;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::EnumDef.
@@ -2303,7 +2575,7 @@ TAO::Objref_Traits<CORBA::EnumDef>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_EnumDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -2322,19 +2594,19 @@ TAO::Collocation_Proxy_Broker *
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_EnumDef_Proxy_Broker_ == 0)
     {
       CORBA_EnumDef_setup_collocation ();
     }
-  
-  TAO::Arg_Traits< CORBA::EnumMemberSeq>::ret_val _tao_retval;
-  
+
+  TAO::Arg_Traits< ::CORBA::EnumMemberSeq>::ret_val _tao_retval;
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -2343,10 +2615,10 @@ TAO::Collocation_Proxy_Broker *
       12,
       this->the_TAO_EnumDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -2365,21 +2637,21 @@ void CORBA::EnumDef::members (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_EnumDef_Proxy_Broker_ == 0)
     {
       CORBA_EnumDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::EnumMemberSeq>::in_arg_val _tao_members (members);
-  
+  TAO::Arg_Traits< ::CORBA::EnumMemberSeq>::in_arg_val _tao_members (members);
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_members
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -2388,7 +2660,7 @@ void CORBA::EnumDef::members (
       12,
       this->the_TAO_EnumDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -2407,14 +2679,14 @@ CORBA::EnumDef::CORBA_EnumDef_setup_collocation ()
       this->the_TAO_EnumDef_Proxy_Broker_ =
         ::CORBA__TAO_EnumDef_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_TypedefDef_setup_collocation ();
 }
 
 CORBA::EnumDef::~EnumDef (void)
 {}
 
-void 
+void
 CORBA::EnumDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   EnumDef *_tao_tmp_pointer =
@@ -2459,7 +2731,7 @@ CORBA::EnumDef::_duplicate (EnumDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -2525,6 +2797,24 @@ CORBA::EnumDef::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_EnumDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/EnumDef:1.0",
+    "EnumDef");
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_EnumDef =
+    &_tao_tc_CORBA_EnumDef;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::AliasDef.
@@ -2561,7 +2851,7 @@ TAO::Objref_Traits<CORBA::AliasDef>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_AliasDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -2580,19 +2870,19 @@ TAO::Collocation_Proxy_Broker *
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_AliasDef_Proxy_Broker_ == 0)
     {
       CORBA_AliasDef_setup_collocation ();
     }
-  
-  TAO::Arg_Traits< CORBA::IDLType>::ret_val _tao_retval;
-  
+
+  TAO::Arg_Traits< ::CORBA::IDLType>::ret_val _tao_retval;
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -2601,10 +2891,10 @@ TAO::Collocation_Proxy_Broker *
       22,
       this->the_TAO_AliasDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -2623,21 +2913,21 @@ void CORBA::AliasDef::original_type_def (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_AliasDef_Proxy_Broker_ == 0)
     {
       CORBA_AliasDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_original_type_def (original_type_def);
-  
+  TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_original_type_def (original_type_def);
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_original_type_def
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -2646,7 +2936,7 @@ void CORBA::AliasDef::original_type_def (
       22,
       this->the_TAO_AliasDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -2665,14 +2955,14 @@ CORBA::AliasDef::CORBA_AliasDef_setup_collocation ()
       this->the_TAO_AliasDef_Proxy_Broker_ =
         ::CORBA__TAO_AliasDef_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_TypedefDef_setup_collocation ();
 }
 
 CORBA::AliasDef::~AliasDef (void)
 {}
 
-void 
+void
 CORBA::AliasDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   AliasDef *_tao_tmp_pointer =
@@ -2717,7 +3007,7 @@ CORBA::AliasDef::_duplicate (AliasDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -2783,6 +3073,24 @@ CORBA::AliasDef::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_AliasDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/AliasDef:1.0",
+    "AliasDef");
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_AliasDef =
+    &_tao_tc_CORBA_AliasDef;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::NativeDef.
@@ -2819,7 +3127,7 @@ TAO::Objref_Traits<CORBA::NativeDef>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_NativeDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -2838,14 +3146,14 @@ CORBA::NativeDef::CORBA_NativeDef_setup_collocation ()
       this->the_TAO_NativeDef_Proxy_Broker_ =
         ::CORBA__TAO_NativeDef_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_TypedefDef_setup_collocation ();
 }
 
 CORBA::NativeDef::~NativeDef (void)
 {}
 
-void 
+void
 CORBA::NativeDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   NativeDef *_tao_tmp_pointer =
@@ -2890,7 +3198,7 @@ CORBA::NativeDef::_duplicate (NativeDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -2956,6 +3264,24 @@ CORBA::NativeDef::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_NativeDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/NativeDef:1.0",
+    "NativeDef");
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_NativeDef =
+    &_tao_tc_CORBA_NativeDef;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::PrimitiveDef.
@@ -2992,7 +3318,7 @@ TAO::Objref_Traits<CORBA::PrimitiveDef>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -3011,19 +3337,19 @@ TAO::Collocation_Proxy_Broker *
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_PrimitiveDef_Proxy_Broker_ == 0)
     {
       CORBA_PrimitiveDef_setup_collocation ();
     }
-  
-  TAO::Arg_Traits< CORBA::PrimitiveKind>::ret_val _tao_retval;
-  
+
+  TAO::Arg_Traits< ::CORBA::PrimitiveKind>::ret_val _tao_retval;
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -3032,10 +3358,10 @@ TAO::Collocation_Proxy_Broker *
       9,
       this->the_TAO_PrimitiveDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -3053,14 +3379,14 @@ CORBA::PrimitiveDef::CORBA_PrimitiveDef_setup_collocation ()
       this->the_TAO_PrimitiveDef_Proxy_Broker_ =
         ::CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_IDLType_setup_collocation ();
 }
 
 CORBA::PrimitiveDef::~PrimitiveDef (void)
 {}
 
-void 
+void
 CORBA::PrimitiveDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   PrimitiveDef *_tao_tmp_pointer =
@@ -3105,7 +3431,7 @@ CORBA::PrimitiveDef::_duplicate (PrimitiveDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -3163,6 +3489,24 @@ CORBA::PrimitiveDef::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_PrimitiveDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/PrimitiveDef:1.0",
+    "PrimitiveDef");
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_PrimitiveDef =
+    &_tao_tc_CORBA_PrimitiveDef;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::StringDef.
@@ -3199,7 +3543,7 @@ TAO::Objref_Traits<CORBA::StringDef>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_StringDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -3218,19 +3562,19 @@ CORBA::ULong CORBA::StringDef::bound (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_StringDef_Proxy_Broker_ == 0)
     {
       CORBA_StringDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::ULong>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -3239,10 +3583,10 @@ CORBA::ULong CORBA::StringDef::bound (
       10,
       this->the_TAO_StringDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -3261,21 +3605,21 @@ void CORBA::StringDef::bound (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_StringDef_Proxy_Broker_ == 0)
     {
       CORBA_StringDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::ULong>::in_arg_val _tao_bound (bound);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_bound
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -3284,7 +3628,7 @@ void CORBA::StringDef::bound (
       10,
       this->the_TAO_StringDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -3303,14 +3647,14 @@ CORBA::StringDef::CORBA_StringDef_setup_collocation ()
       this->the_TAO_StringDef_Proxy_Broker_ =
         ::CORBA__TAO_StringDef_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_IDLType_setup_collocation ();
 }
 
 CORBA::StringDef::~StringDef (void)
 {}
 
-void 
+void
 CORBA::StringDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   StringDef *_tao_tmp_pointer =
@@ -3355,7 +3699,7 @@ CORBA::StringDef::_duplicate (StringDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -3413,6 +3757,24 @@ CORBA::StringDef::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_StringDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/StringDef:1.0",
+    "StringDef");
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_StringDef =
+    &_tao_tc_CORBA_StringDef;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::WstringDef.
@@ -3449,7 +3811,7 @@ TAO::Objref_Traits<CORBA::WstringDef>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_WstringDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -3468,19 +3830,19 @@ CORBA::ULong CORBA::WstringDef::bound (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_WstringDef_Proxy_Broker_ == 0)
     {
       CORBA_WstringDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::ULong>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -3489,10 +3851,10 @@ CORBA::ULong CORBA::WstringDef::bound (
       10,
       this->the_TAO_WstringDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -3511,21 +3873,21 @@ void CORBA::WstringDef::bound (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_WstringDef_Proxy_Broker_ == 0)
     {
       CORBA_WstringDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::ULong>::in_arg_val _tao_bound (bound);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_bound
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -3534,7 +3896,7 @@ void CORBA::WstringDef::bound (
       10,
       this->the_TAO_WstringDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -3553,14 +3915,14 @@ CORBA::WstringDef::CORBA_WstringDef_setup_collocation ()
       this->the_TAO_WstringDef_Proxy_Broker_ =
         ::CORBA__TAO_WstringDef_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_IDLType_setup_collocation ();
 }
 
 CORBA::WstringDef::~WstringDef (void)
 {}
 
-void 
+void
 CORBA::WstringDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   WstringDef *_tao_tmp_pointer =
@@ -3605,7 +3967,7 @@ CORBA::WstringDef::_duplicate (WstringDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -3663,6 +4025,24 @@ CORBA::WstringDef::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_WstringDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/WstringDef:1.0",
+    "WstringDef");
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_WstringDef =
+    &_tao_tc_CORBA_WstringDef;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::SequenceDef.
@@ -3699,7 +4079,7 @@ TAO::Objref_Traits<CORBA::SequenceDef>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_SequenceDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -3718,19 +4098,19 @@ CORBA::ULong CORBA::SequenceDef::bound (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_SequenceDef_Proxy_Broker_ == 0)
     {
       CORBA_SequenceDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::ULong>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -3739,10 +4119,10 @@ CORBA::ULong CORBA::SequenceDef::bound (
       10,
       this->the_TAO_SequenceDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -3761,21 +4141,21 @@ void CORBA::SequenceDef::bound (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_SequenceDef_Proxy_Broker_ == 0)
     {
       CORBA_SequenceDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::ULong>::in_arg_val _tao_bound (bound);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_bound
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -3784,7 +4164,7 @@ void CORBA::SequenceDef::bound (
       10,
       this->the_TAO_SequenceDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -3803,19 +4183,19 @@ CORBA::TypeCode_ptr CORBA::SequenceDef::element_type (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_SequenceDef_Proxy_Broker_ == 0)
     {
       CORBA_SequenceDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::TypeCode>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -3824,10 +4204,10 @@ CORBA::TypeCode_ptr CORBA::SequenceDef::element_type (
       17,
       this->the_TAO_SequenceDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -3845,19 +4225,19 @@ CORBA::TypeCode_ptr CORBA::SequenceDef::element_type (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_SequenceDef_Proxy_Broker_ == 0)
     {
       CORBA_SequenceDef_setup_collocation ();
     }
-  
-  TAO::Arg_Traits< CORBA::IDLType>::ret_val _tao_retval;
-  
+
+  TAO::Arg_Traits< ::CORBA::IDLType>::ret_val _tao_retval;
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -3866,10 +4246,10 @@ CORBA::TypeCode_ptr CORBA::SequenceDef::element_type (
       21,
       this->the_TAO_SequenceDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -3888,21 +4268,21 @@ void CORBA::SequenceDef::element_type_def (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_SequenceDef_Proxy_Broker_ == 0)
     {
       CORBA_SequenceDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_element_type_def (element_type_def);
-  
+  TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_element_type_def (element_type_def);
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_element_type_def
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -3911,7 +4291,7 @@ void CORBA::SequenceDef::element_type_def (
       21,
       this->the_TAO_SequenceDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -3930,14 +4310,14 @@ CORBA::SequenceDef::CORBA_SequenceDef_setup_collocation ()
       this->the_TAO_SequenceDef_Proxy_Broker_ =
         ::CORBA__TAO_SequenceDef_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_IDLType_setup_collocation ();
 }
 
 CORBA::SequenceDef::~SequenceDef (void)
 {}
 
-void 
+void
 CORBA::SequenceDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   SequenceDef *_tao_tmp_pointer =
@@ -3982,7 +4362,7 @@ CORBA::SequenceDef::_duplicate (SequenceDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -4040,6 +4420,24 @@ CORBA::SequenceDef::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_SequenceDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/SequenceDef:1.0",
+    "SequenceDef");
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_SequenceDef =
+    &_tao_tc_CORBA_SequenceDef;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::ArrayDef.
@@ -4076,7 +4474,7 @@ TAO::Objref_Traits<CORBA::ArrayDef>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_ArrayDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -4095,19 +4493,19 @@ CORBA::ULong CORBA::ArrayDef::length (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ArrayDef_Proxy_Broker_ == 0)
     {
       CORBA_ArrayDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::ULong>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -4116,10 +4514,10 @@ CORBA::ULong CORBA::ArrayDef::length (
       11,
       this->the_TAO_ArrayDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -4138,21 +4536,21 @@ void CORBA::ArrayDef::length (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ArrayDef_Proxy_Broker_ == 0)
     {
       CORBA_ArrayDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::ULong>::in_arg_val _tao_length (length);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_length
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -4161,7 +4559,7 @@ void CORBA::ArrayDef::length (
       11,
       this->the_TAO_ArrayDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -4180,19 +4578,19 @@ CORBA::TypeCode_ptr CORBA::ArrayDef::element_type (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ArrayDef_Proxy_Broker_ == 0)
     {
       CORBA_ArrayDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::TypeCode>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -4201,10 +4599,10 @@ CORBA::TypeCode_ptr CORBA::ArrayDef::element_type (
       17,
       this->the_TAO_ArrayDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -4222,19 +4620,19 @@ CORBA::TypeCode_ptr CORBA::ArrayDef::element_type (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ArrayDef_Proxy_Broker_ == 0)
     {
       CORBA_ArrayDef_setup_collocation ();
     }
-  
-  TAO::Arg_Traits< CORBA::IDLType>::ret_val _tao_retval;
-  
+
+  TAO::Arg_Traits< ::CORBA::IDLType>::ret_val _tao_retval;
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -4243,10 +4641,10 @@ CORBA::TypeCode_ptr CORBA::ArrayDef::element_type (
       21,
       this->the_TAO_ArrayDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -4265,21 +4663,21 @@ void CORBA::ArrayDef::element_type_def (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ArrayDef_Proxy_Broker_ == 0)
     {
       CORBA_ArrayDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_element_type_def (element_type_def);
-  
+  TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_element_type_def (element_type_def);
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_element_type_def
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -4288,7 +4686,7 @@ void CORBA::ArrayDef::element_type_def (
       21,
       this->the_TAO_ArrayDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -4307,14 +4705,14 @@ CORBA::ArrayDef::CORBA_ArrayDef_setup_collocation ()
       this->the_TAO_ArrayDef_Proxy_Broker_ =
         ::CORBA__TAO_ArrayDef_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_IDLType_setup_collocation ();
 }
 
 CORBA::ArrayDef::~ArrayDef (void)
 {}
 
-void 
+void
 CORBA::ArrayDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ArrayDef *_tao_tmp_pointer =
@@ -4359,7 +4757,7 @@ CORBA::ArrayDef::_duplicate (ArrayDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -4417,6 +4815,24 @@ CORBA::ArrayDef::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ArrayDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/ArrayDef:1.0",
+    "ArrayDef");
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ArrayDef =
+    &_tao_tc_CORBA_ArrayDef;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::ExceptionDef.
@@ -4453,7 +4869,7 @@ TAO::Objref_Traits<CORBA::ExceptionDef>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -4472,19 +4888,19 @@ CORBA::TypeCode_ptr CORBA::ExceptionDef::type (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ExceptionDef_Proxy_Broker_ == 0)
     {
       CORBA_ExceptionDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::TypeCode>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -4493,10 +4909,10 @@ CORBA::TypeCode_ptr CORBA::ExceptionDef::type (
       9,
       this->the_TAO_ExceptionDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -4514,19 +4930,19 @@ CORBA::TypeCode_ptr CORBA::ExceptionDef::type (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ExceptionDef_Proxy_Broker_ == 0)
     {
       CORBA_ExceptionDef_setup_collocation ();
     }
-  
-  TAO::Arg_Traits< CORBA::StructMemberSeq>::ret_val _tao_retval;
-  
+
+  TAO::Arg_Traits< ::CORBA::StructMemberSeq>::ret_val _tao_retval;
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -4535,10 +4951,10 @@ CORBA::TypeCode_ptr CORBA::ExceptionDef::type (
       12,
       this->the_TAO_ExceptionDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -4557,21 +4973,21 @@ void CORBA::ExceptionDef::members (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ExceptionDef_Proxy_Broker_ == 0)
     {
       CORBA_ExceptionDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::StructMemberSeq>::in_arg_val _tao_members (members);
-  
+  TAO::Arg_Traits< ::CORBA::StructMemberSeq>::in_arg_val _tao_members (members);
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_members
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -4580,7 +4996,7 @@ void CORBA::ExceptionDef::members (
       12,
       this->the_TAO_ExceptionDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -4599,7 +5015,7 @@ CORBA::ExceptionDef::CORBA_ExceptionDef_setup_collocation ()
       this->the_TAO_ExceptionDef_Proxy_Broker_ =
         ::CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_Contained_setup_collocation ();
   this->CORBA_Container_setup_collocation ();
 }
@@ -4607,7 +5023,7 @@ CORBA::ExceptionDef::CORBA_ExceptionDef_setup_collocation ()
 CORBA::ExceptionDef::~ExceptionDef (void)
 {}
 
-void 
+void
 CORBA::ExceptionDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ExceptionDef *_tao_tmp_pointer =
@@ -4652,7 +5068,7 @@ CORBA::ExceptionDef::_duplicate (ExceptionDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -4713,7 +5129,25 @@ CORBA::ExceptionDef::marshal (TAO_OutputCDR &cdr)
   return (cdr << this);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ExceptionDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/ExceptionDef:1.0",
+    "ExceptionDef");
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ExceptionDef =
+    &_tao_tc_CORBA_ExceptionDef;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_EXCEPTIONDEFSEQ_CS_)
@@ -4726,8 +5160,8 @@ CORBA::ExceptionDefSeq::ExceptionDefSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::ExceptionDef,
-        CORBA::ExceptionDef_var
+        ExceptionDef,
+        ExceptionDef_var
       >
     (max)
 {}
@@ -4739,8 +5173,8 @@ CORBA::ExceptionDefSeq::ExceptionDefSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::ExceptionDef,
-        CORBA::ExceptionDef_var
+        ExceptionDef,
+        ExceptionDef_var
       >
     (max, length, buffer, release)
 {}
@@ -4749,8 +5183,8 @@ CORBA::ExceptionDefSeq::ExceptionDefSeq (
     const ExceptionDefSeq &seq
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::ExceptionDef,
-        CORBA::ExceptionDef_var
+        ExceptionDef,
+        ExceptionDef_var
       >
     (seq)
 {}
@@ -4770,6 +5204,81 @@ void CORBA::ExceptionDefSeq::_tao_any_destructor (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+#ifndef _TAO_TYPECODE_CORBA_ExceptionDefSeq_GUARD
+#define _TAO_TYPECODE_CORBA_ExceptionDefSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_ExceptionDefSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::_tc_ExceptionDef,
+        0U);
+
+    ::CORBA::TypeCode_ptr const tc_CORBA_ExceptionDefSeq_0 =
+      &CORBA_ExceptionDefSeq_0;
+
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_ExceptionDefSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ExceptionDefSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/ExceptionDefSeq:1.0",
+    "ExceptionDefSeq",
+    &TAO::TypeCode::tc_CORBA_ExceptionDefSeq_0);
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ExceptionDefSeq =
+    &_tao_tc_CORBA_ExceptionDefSeq;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/enum_typecode.cpp:34
+
+static char const * const _tao_enumerators_CORBA_AttributeMode[] =
+  {
+    "ATTR_NORMAL",
+    "ATTR_READONLY"
+
+  };
+
+static TAO::TypeCode::Enum<char const *,
+                           char const * const *,
+                           TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_AttributeMode (
+    "IDL:omg.org/CORBA/AttributeMode:1.0",
+    "AttributeMode",
+    _tao_enumerators_CORBA_AttributeMode,
+    2);
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_AttributeMode =
+    &_tao_tc_CORBA_AttributeMode;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::AttributeDef.
@@ -4806,7 +5315,7 @@ TAO::Objref_Traits<CORBA::AttributeDef>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_AttributeDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -4825,19 +5334,19 @@ CORBA::TypeCode_ptr CORBA::AttributeDef::type (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_AttributeDef_Proxy_Broker_ == 0)
     {
       CORBA_AttributeDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::TypeCode>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -4846,10 +5355,10 @@ CORBA::TypeCode_ptr CORBA::AttributeDef::type (
       9,
       this->the_TAO_AttributeDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -4867,19 +5376,19 @@ CORBA::TypeCode_ptr CORBA::AttributeDef::type (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_AttributeDef_Proxy_Broker_ == 0)
     {
       CORBA_AttributeDef_setup_collocation ();
     }
-  
-  TAO::Arg_Traits< CORBA::IDLType>::ret_val _tao_retval;
-  
+
+  TAO::Arg_Traits< ::CORBA::IDLType>::ret_val _tao_retval;
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -4888,10 +5397,10 @@ CORBA::TypeCode_ptr CORBA::AttributeDef::type (
       13,
       this->the_TAO_AttributeDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -4910,21 +5419,21 @@ void CORBA::AttributeDef::type_def (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_AttributeDef_Proxy_Broker_ == 0)
     {
       CORBA_AttributeDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_type_def (type_def);
-  
+  TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type_def (type_def);
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_type_def
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -4933,7 +5442,7 @@ void CORBA::AttributeDef::type_def (
       13,
       this->the_TAO_AttributeDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -4952,19 +5461,19 @@ void CORBA::AttributeDef::type_def (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_AttributeDef_Proxy_Broker_ == 0)
     {
       CORBA_AttributeDef_setup_collocation ();
     }
-  
-  TAO::Arg_Traits< CORBA::AttributeMode>::ret_val _tao_retval;
-  
+
+  TAO::Arg_Traits< ::CORBA::AttributeMode>::ret_val _tao_retval;
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -4973,10 +5482,10 @@ void CORBA::AttributeDef::type_def (
       9,
       this->the_TAO_AttributeDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -4995,21 +5504,21 @@ void CORBA::AttributeDef::mode (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_AttributeDef_Proxy_Broker_ == 0)
     {
       CORBA_AttributeDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::AttributeMode>::in_arg_val _tao_mode (mode);
-  
+  TAO::Arg_Traits< ::CORBA::AttributeMode>::in_arg_val _tao_mode (mode);
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_mode
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -5018,7 +5527,7 @@ void CORBA::AttributeDef::mode (
       9,
       this->the_TAO_AttributeDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -5037,14 +5546,14 @@ CORBA::AttributeDef::CORBA_AttributeDef_setup_collocation ()
       this->the_TAO_AttributeDef_Proxy_Broker_ =
         ::CORBA__TAO_AttributeDef_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_Contained_setup_collocation ();
 }
 
 CORBA::AttributeDef::~AttributeDef (void)
 {}
 
-void 
+void
 CORBA::AttributeDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   AttributeDef *_tao_tmp_pointer =
@@ -5089,7 +5598,7 @@ CORBA::AttributeDef::_duplicate (AttributeDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -5146,10 +5655,60 @@ CORBA::AttributeDef::marshal (TAO_OutputCDR &cdr)
   return (cdr << this);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_AttributeDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/AttributeDef:1.0",
+    "AttributeDef");
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_AttributeDef =
+    &_tao_tc_CORBA_AttributeDef;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_AttributeDescription[] =
+  {
+    { "name", &CORBA::_tc_Identifier },
+    { "id", &CORBA::_tc_RepositoryId },
+    { "defined_in", &CORBA::_tc_RepositoryId },
+    { "version", &CORBA::_tc_VersionSpec },
+    { "type", &CORBA::_tc_TypeCode },
+    { "mode", &CORBA::_tc_AttributeMode }
+
+  };
+static TAO::TypeCode::Struct<char const *,
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_AttributeDescription (
+    CORBA::tk_struct,
+    "IDL:omg.org/CORBA/AttributeDescription:1.0",
+    "AttributeDescription",
+    _tao_fields_CORBA_AttributeDescription,
+    6);
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_AttributeDescription =
+    &_tao_tc_CORBA_AttributeDescription;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 CORBA::AttributeDescription::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -5159,10 +5718,58 @@ CORBA::AttributeDescription::_tao_any_destructor (
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ExtAttributeDescription[] =
+  {
+    { "name", &CORBA::_tc_Identifier },
+    { "id", &CORBA::_tc_RepositoryId },
+    { "defined_in", &CORBA::_tc_RepositoryId },
+    { "version", &CORBA::_tc_VersionSpec },
+    { "type", &CORBA::_tc_TypeCode },
+    { "mode", &CORBA::_tc_AttributeMode },
+    { "get_exceptions", &CORBA::_tc_ExcDescriptionSeq },
+    { "put_exceptions", &CORBA::_tc_ExcDescriptionSeq }
+
+  };
+static TAO::TypeCode::Recursive_Type<
+  TAO::TypeCode::Struct<char const *,
+                        CORBA::TypeCode_ptr const *,
+                        TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                        TAO::Null_RefCount_Policy>,
+  CORBA::TypeCode_ptr const *,
+  TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * >
+
+  _tao_tc_CORBA_ExtAttributeDescription (
+    CORBA::tk_struct,
+    "IDL:omg.org/CORBA/ExtAttributeDescription:1.0",
+    "ExtAttributeDescription",
+    _tao_fields_CORBA_ExtAttributeDescription,
+    8);
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ExtAttributeDescription =
+    &_tao_tc_CORBA_ExtAttributeDescription;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 CORBA::ExtAttributeDescription::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -5209,7 +5816,7 @@ TAO::Objref_Traits<CORBA::ExtAttributeDef>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_ExtAttributeDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -5228,19 +5835,19 @@ TAO::Collocation_Proxy_Broker *
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ExtAttributeDef_Proxy_Broker_ == 0)
     {
       CORBA_ExtAttributeDef_setup_collocation ();
     }
-  
-  TAO::Arg_Traits< CORBA::ExcDescriptionSeq>::ret_val _tao_retval;
-  
+
+  TAO::Arg_Traits< ::CORBA::ExcDescriptionSeq>::ret_val _tao_retval;
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -5249,10 +5856,10 @@ TAO::Collocation_Proxy_Broker *
       19,
       this->the_TAO_ExtAttributeDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -5271,21 +5878,21 @@ void CORBA::ExtAttributeDef::get_exceptions (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ExtAttributeDef_Proxy_Broker_ == 0)
     {
       CORBA_ExtAttributeDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::ExcDescriptionSeq>::in_arg_val _tao_get_exceptions (get_exceptions);
-  
+  TAO::Arg_Traits< ::CORBA::ExcDescriptionSeq>::in_arg_val _tao_get_exceptions (get_exceptions);
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_get_exceptions
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -5294,7 +5901,7 @@ void CORBA::ExtAttributeDef::get_exceptions (
       19,
       this->the_TAO_ExtAttributeDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -5313,19 +5920,19 @@ void CORBA::ExtAttributeDef::get_exceptions (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ExtAttributeDef_Proxy_Broker_ == 0)
     {
       CORBA_ExtAttributeDef_setup_collocation ();
     }
-  
-  TAO::Arg_Traits< CORBA::ExcDescriptionSeq>::ret_val _tao_retval;
-  
+
+  TAO::Arg_Traits< ::CORBA::ExcDescriptionSeq>::ret_val _tao_retval;
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -5334,10 +5941,10 @@ void CORBA::ExtAttributeDef::get_exceptions (
       19,
       this->the_TAO_ExtAttributeDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -5356,21 +5963,21 @@ void CORBA::ExtAttributeDef::set_exceptions (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ExtAttributeDef_Proxy_Broker_ == 0)
     {
       CORBA_ExtAttributeDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::ExcDescriptionSeq>::in_arg_val _tao_set_exceptions (set_exceptions);
-  
+  TAO::Arg_Traits< ::CORBA::ExcDescriptionSeq>::in_arg_val _tao_set_exceptions (set_exceptions);
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_set_exceptions
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -5379,7 +5986,7 @@ void CORBA::ExtAttributeDef::set_exceptions (
       19,
       this->the_TAO_ExtAttributeDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -5398,19 +6005,19 @@ void CORBA::ExtAttributeDef::set_exceptions (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ExtAttributeDef_Proxy_Broker_ == 0)
     {
       CORBA_ExtAttributeDef_setup_collocation ();
     }
-  
-  TAO::Arg_Traits< CORBA::ExtAttributeDescription>::ret_val _tao_retval;
-  
+
+  TAO::Arg_Traits< ::CORBA::ExtAttributeDescription>::ret_val _tao_retval;
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -5419,10 +6026,10 @@ void CORBA::ExtAttributeDef::set_exceptions (
       18,
       this->the_TAO_ExtAttributeDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -5440,14 +6047,14 @@ CORBA::ExtAttributeDef::CORBA_ExtAttributeDef_setup_collocation ()
       this->the_TAO_ExtAttributeDef_Proxy_Broker_ =
         ::CORBA__TAO_ExtAttributeDef_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_AttributeDef_setup_collocation ();
 }
 
 CORBA::ExtAttributeDef::~ExtAttributeDef (void)
 {}
 
-void 
+void
 CORBA::ExtAttributeDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ExtAttributeDef *_tao_tmp_pointer =
@@ -5492,7 +6099,7 @@ CORBA::ExtAttributeDef::_duplicate (ExtAttributeDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -5553,10 +6160,85 @@ CORBA::ExtAttributeDef::marshal (TAO_OutputCDR &cdr)
   return (cdr << this);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ExtAttributeDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/ExtAttributeDef:1.0",
+    "ExtAttributeDef");
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ExtAttributeDef =
+    &_tao_tc_CORBA_ExtAttributeDef;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/enum_typecode.cpp:34
+
+static char const * const _tao_enumerators_CORBA_OperationMode[] =
+  {
+    "OP_NORMAL",
+    "OP_ONEWAY"
+
+  };
+
+static TAO::TypeCode::Enum<char const *,
+                           char const * const *,
+                           TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_OperationMode (
+    "IDL:omg.org/CORBA/OperationMode:1.0",
+    "OperationMode",
+    _tao_enumerators_CORBA_OperationMode,
+    2);
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_OperationMode =
+    &_tao_tc_CORBA_OperationMode;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ParameterDescription[] =
+  {
+    { "name", &CORBA::_tc_Identifier },
+    { "type", &CORBA::_tc_TypeCode },
+    { "type_def", &CORBA::_tc_IDLType },
+    { "mode", &CORBA::_tc_ParameterMode }
+
+  };
+static TAO::TypeCode::Struct<char const *,
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ParameterDescription (
+    CORBA::tk_struct,
+    "IDL:omg.org/CORBA/ParameterDescription:1.0",
+    "ParameterDescription",
+    _tao_fields_CORBA_ParameterDescription,
+    4);
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ParameterDescription =
+    &_tao_tc_CORBA_ParameterDescription;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 CORBA::ParameterDescription::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -5579,7 +6261,7 @@ CORBA::ParDescriptionSeq::ParDescriptionSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ParameterDescription
+        ParameterDescription
       >
     (max)
 {}
@@ -5591,7 +6273,7 @@ CORBA::ParDescriptionSeq::ParDescriptionSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ParameterDescription
+        ParameterDescription
       >
     (max, length, buffer, release)
 {}
@@ -5600,7 +6282,7 @@ CORBA::ParDescriptionSeq::ParDescriptionSeq (
     const ParDescriptionSeq &seq
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ParameterDescription
+        ParameterDescription
       >
     (seq)
 {}
@@ -5619,6 +6301,74 @@ void CORBA::ParDescriptionSeq::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+#ifndef _TAO_TYPECODE_CORBA_ParDescriptionSeq_GUARD
+#define _TAO_TYPECODE_CORBA_ParDescriptionSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_ParDescriptionSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::_tc_ParameterDescription,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_CORBA_ParDescriptionSeq_0 =
+      &CORBA_ParDescriptionSeq_0;
+    
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_ParDescriptionSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ParDescriptionSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/ParDescriptionSeq:1.0",
+    "ParDescriptionSeq",
+    &TAO::TypeCode::tc_CORBA_ParDescriptionSeq_0);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ParDescriptionSeq =
+    &_tao_tc_CORBA_ParDescriptionSeq;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ContextIdentifier (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/ContextIdentifier:1.0",
+    "ContextIdentifier",
+    &CORBA::_tc_Identifier);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ContextIdentifier =
+    &_tao_tc_CORBA_ContextIdentifier;
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
@@ -5667,6 +6417,54 @@ void CORBA::ContextIdSeq::_tao_any_destructor (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+#ifndef _TAO_TYPECODE_CORBA_ContextIdSeq_GUARD
+#define _TAO_TYPECODE_CORBA_ContextIdSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_ContextIdSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::_tc_ContextIdentifier,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_CORBA_ContextIdSeq_0 =
+      &CORBA_ContextIdSeq_0;
+    
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_ContextIdSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ContextIdSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/ContextIdSeq:1.0",
+    "ContextIdSeq",
+    &TAO::TypeCode::tc_CORBA_ContextIdSeq_0);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ContextIdSeq =
+    &_tao_tc_CORBA_ContextIdSeq;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::OperationDef.
@@ -5770,7 +6568,7 @@ CORBA::TypeCode_ptr CORBA::OperationDef::result (
       CORBA_OperationDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::IDLType>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::IDLType>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -5814,7 +6612,7 @@ void CORBA::OperationDef::result_def (
     }
   
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_result_def (result_def);
+  TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_result_def (result_def);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -5855,7 +6653,7 @@ void CORBA::OperationDef::result_def (
       CORBA_OperationDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ParDescriptionSeq>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::ParDescriptionSeq>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -5899,7 +6697,7 @@ void CORBA::OperationDef::params (
     }
   
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::ParDescriptionSeq>::in_arg_val _tao_params (params);
+  TAO::Arg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_val _tao_params (params);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -5940,7 +6738,7 @@ void CORBA::OperationDef::params (
       CORBA_OperationDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::OperationMode>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::OperationMode>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -5984,7 +6782,7 @@ void CORBA::OperationDef::mode (
     }
   
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::OperationMode>::in_arg_val _tao_mode (mode);
+  TAO::Arg_Traits< ::CORBA::OperationMode>::in_arg_val _tao_mode (mode);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -6025,7 +6823,7 @@ void CORBA::OperationDef::mode (
       CORBA_OperationDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ContextIdSeq>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::ContextIdSeq>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -6069,7 +6867,7 @@ void CORBA::OperationDef::contexts (
     }
   
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::ContextIdSeq>::in_arg_val _tao_contexts (contexts);
+  TAO::Arg_Traits< ::CORBA::ContextIdSeq>::in_arg_val _tao_contexts (contexts);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -6110,7 +6908,7 @@ void CORBA::OperationDef::contexts (
       CORBA_OperationDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ExceptionDefSeq>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::ExceptionDefSeq>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -6154,7 +6952,7 @@ void CORBA::OperationDef::exceptions (
     }
   
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions (exceptions);
+  TAO::Arg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions (exceptions);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -6298,6 +7096,74 @@ CORBA::OperationDef::marshal (TAO_OutputCDR &cdr)
   return (cdr << this);
 }
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_OperationDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/OperationDef:1.0",
+    "OperationDef");
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_OperationDef =
+    &_tao_tc_CORBA_OperationDef;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_OperationDescription[] =
+  {
+    { "name", &CORBA::_tc_Identifier },
+    { "id", &CORBA::_tc_RepositoryId },
+    { "defined_in", &CORBA::_tc_RepositoryId },
+    { "version", &CORBA::_tc_VersionSpec },
+    { "result", &CORBA::_tc_TypeCode },
+    { "mode", &CORBA::_tc_OperationMode },
+    { "contexts", &CORBA::_tc_ContextIdSeq },
+    { "parameters", &CORBA::_tc_ParDescriptionSeq },
+    { "exceptions", &CORBA::_tc_ExcDescriptionSeq }
+    
+  };
+static TAO::TypeCode::Struct<char const *,
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_OperationDescription (
+    CORBA::tk_struct,
+    "IDL:omg.org/CORBA/OperationDescription:1.0",
+    "OperationDescription",
+    _tao_fields_CORBA_OperationDescription,
+    9);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_OperationDescription =
+    &_tao_tc_CORBA_OperationDescription;
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
@@ -6358,6 +7224,54 @@ void CORBA::RepositoryIdSeq::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+#ifndef _TAO_TYPECODE_CORBA_RepositoryIdSeq_GUARD
+#define _TAO_TYPECODE_CORBA_RepositoryIdSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_RepositoryIdSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::_tc_RepositoryId,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_CORBA_RepositoryIdSeq_0 =
+      &CORBA_RepositoryIdSeq_0;
+    
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_RepositoryIdSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_RepositoryIdSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/RepositoryIdSeq:1.0",
+    "RepositoryIdSeq",
+    &TAO::TypeCode::tc_CORBA_RepositoryIdSeq_0);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_RepositoryIdSeq =
+    &_tao_tc_CORBA_RepositoryIdSeq;
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
@@ -6371,7 +7285,7 @@ CORBA::OpDescriptionSeq::OpDescriptionSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Sequence<
-        CORBA::OperationDescription
+        OperationDescription
       >
     (max)
 {}
@@ -6383,7 +7297,7 @@ CORBA::OpDescriptionSeq::OpDescriptionSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Sequence<
-        CORBA::OperationDescription
+        OperationDescription
       >
     (max, length, buffer, release)
 {}
@@ -6392,7 +7306,7 @@ CORBA::OpDescriptionSeq::OpDescriptionSeq (
     const OpDescriptionSeq &seq
   )
   : TAO_Unbounded_Sequence<
-        CORBA::OperationDescription
+        OperationDescription
       >
     (seq)
 {}
@@ -6411,6 +7325,54 @@ void CORBA::OpDescriptionSeq::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+#ifndef _TAO_TYPECODE_CORBA_OpDescriptionSeq_GUARD
+#define _TAO_TYPECODE_CORBA_OpDescriptionSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_OpDescriptionSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::_tc_OperationDescription,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_CORBA_OpDescriptionSeq_0 =
+      &CORBA_OpDescriptionSeq_0;
+    
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_OpDescriptionSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_OpDescriptionSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/OpDescriptionSeq:1.0",
+    "OpDescriptionSeq",
+    &TAO::TypeCode::tc_CORBA_OpDescriptionSeq_0);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_OpDescriptionSeq =
+    &_tao_tc_CORBA_OpDescriptionSeq;
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
@@ -6424,7 +7386,7 @@ CORBA::AttrDescriptionSeq::AttrDescriptionSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Sequence<
-        CORBA::AttributeDescription
+        AttributeDescription
       >
     (max)
 {}
@@ -6436,7 +7398,7 @@ CORBA::AttrDescriptionSeq::AttrDescriptionSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Sequence<
-        CORBA::AttributeDescription
+        AttributeDescription
       >
     (max, length, buffer, release)
 {}
@@ -6445,7 +7407,7 @@ CORBA::AttrDescriptionSeq::AttrDescriptionSeq (
     const AttrDescriptionSeq &seq
   )
   : TAO_Unbounded_Sequence<
-        CORBA::AttributeDescription
+        AttributeDescription
       >
     (seq)
 {}
@@ -6464,6 +7426,54 @@ void CORBA::AttrDescriptionSeq::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+#ifndef _TAO_TYPECODE_CORBA_AttrDescriptionSeq_GUARD
+#define _TAO_TYPECODE_CORBA_AttrDescriptionSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_AttrDescriptionSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::_tc_AttributeDescription,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_CORBA_AttrDescriptionSeq_0 =
+      &CORBA_AttrDescriptionSeq_0;
+    
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_AttrDescriptionSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_AttrDescriptionSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/AttrDescriptionSeq:1.0",
+    "AttrDescriptionSeq",
+    &TAO::TypeCode::tc_CORBA_AttrDescriptionSeq_0);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_AttrDescriptionSeq =
+    &_tao_tc_CORBA_AttrDescriptionSeq;
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
@@ -6477,7 +7487,7 @@ CORBA::ExtAttrDescriptionSeq::ExtAttrDescriptionSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ExtAttributeDescription
+        ExtAttributeDescription
       >
     (max)
 {}
@@ -6489,7 +7499,7 @@ CORBA::ExtAttrDescriptionSeq::ExtAttrDescriptionSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ExtAttributeDescription
+        ExtAttributeDescription
       >
     (max, length, buffer, release)
 {}
@@ -6498,7 +7508,7 @@ CORBA::ExtAttrDescriptionSeq::ExtAttrDescriptionSeq (
     const ExtAttrDescriptionSeq &seq
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ExtAttributeDescription
+        ExtAttributeDescription
       >
     (seq)
 {}
@@ -6518,6 +7528,54 @@ void CORBA::ExtAttrDescriptionSeq::_tao_any_destructor (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+#ifndef _TAO_TYPECODE_CORBA_ExtAttrDescriptionSeq_GUARD
+#define _TAO_TYPECODE_CORBA_ExtAttrDescriptionSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_ExtAttrDescriptionSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::_tc_ExtAttributeDescription,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_CORBA_ExtAttrDescriptionSeq_0 =
+      &CORBA_ExtAttrDescriptionSeq_0;
+    
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_ExtAttrDescriptionSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ExtAttrDescriptionSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/ExtAttrDescriptionSeq:1.0",
+    "ExtAttrDescriptionSeq",
+    &TAO::TypeCode::tc_CORBA_ExtAttrDescriptionSeq_0);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ExtAttrDescriptionSeq =
+    &_tao_tc_CORBA_ExtAttrDescriptionSeq;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::InterfaceDef.
@@ -6579,7 +7637,7 @@ TAO::Collocation_Proxy_Broker *
       CORBA_InterfaceDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -6623,7 +7681,7 @@ void CORBA::InterfaceDef::base_interfaces (
     }
   
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::in_arg_val _tao_base_interfaces (base_interfaces);
+  TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_base_interfaces (base_interfaces);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -6666,7 +7724,7 @@ CORBA::Boolean CORBA::InterfaceDef::is_a (
     }
   
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_interface_id (interface_id);
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_interface_id (interface_id);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -6689,6 +7747,50 @@ CORBA::Boolean CORBA::InterfaceDef::is_a (
   return _tao_retval.retn ();
 }
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_InterfaceDef_FullInterfaceDescription[] =
+  {
+    { "name", &CORBA::_tc_Identifier },
+    { "id", &CORBA::_tc_RepositoryId },
+    { "defined_in", &CORBA::_tc_RepositoryId },
+    { "version", &CORBA::_tc_VersionSpec },
+    { "operations", &CORBA::_tc_OpDescriptionSeq },
+    { "attributes", &CORBA::_tc_AttrDescriptionSeq },
+    { "base_interfaces", &CORBA::_tc_RepositoryIdSeq },
+    { "type", &CORBA::_tc_TypeCode }
+    
+  };
+static TAO::TypeCode::Struct<char const *,
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_InterfaceDef_FullInterfaceDescription (
+    CORBA::tk_struct,
+    "IDL:omg.org/CORBA/InterfaceDef/FullInterfaceDescription:1.0",
+    "FullInterfaceDescription",
+    _tao_fields_CORBA_InterfaceDef_FullInterfaceDescription,
+    8);
+  
+::CORBA::TypeCode_ptr const CORBA::InterfaceDef::_tc_FullInterfaceDescription =
+  &_tao_tc_CORBA_InterfaceDef_FullInterfaceDescription;
+
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
@@ -6722,7 +7824,7 @@ CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor (
       CORBA_InterfaceDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::InterfaceDef::FullInterfaceDescription>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::InterfaceDef::FullInterfaceDescription>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -6769,12 +7871,12 @@ CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor (
       CORBA_InterfaceDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::AttributeDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_type (type);
-  TAO::Arg_Traits< CORBA::AttributeMode>::in_arg_val _tao_mode (mode);
+  TAO::Arg_Traits< ::CORBA::AttributeDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type (type);
+  TAO::Arg_Traits< ::CORBA::AttributeMode>::in_arg_val _tao_mode (mode);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -6829,15 +7931,15 @@ CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor (
       CORBA_InterfaceDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::OperationDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_result (result);
-  TAO::Arg_Traits< CORBA::OperationMode>::in_arg_val _tao_mode (mode);
-  TAO::Arg_Traits< CORBA::ParDescriptionSeq>::in_arg_val _tao_params (params);
-  TAO::Arg_Traits< CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions (exceptions);
-  TAO::Arg_Traits< CORBA::ContextIdSeq>::in_arg_val _tao_contexts (contexts);
+  TAO::Arg_Traits< ::CORBA::OperationDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_result (result);
+  TAO::Arg_Traits< ::CORBA::OperationMode>::in_arg_val _tao_mode (mode);
+  TAO::Arg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_val _tao_params (params);
+  TAO::Arg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions (exceptions);
+  TAO::Arg_Traits< ::CORBA::ContextIdSeq>::in_arg_val _tao_contexts (contexts);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -7000,6 +8102,60 @@ CORBA::InterfaceDef::marshal (TAO_OutputCDR &cdr)
   return (cdr << this);
 }
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_InterfaceDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/InterfaceDef:1.0",
+    "InterfaceDef");
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_InterfaceDef =
+    &_tao_tc_CORBA_InterfaceDef;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_InterfaceDescription[] =
+  {
+    { "name", &CORBA::_tc_Identifier },
+    { "id", &CORBA::_tc_RepositoryId },
+    { "defined_in", &CORBA::_tc_RepositoryId },
+    { "version", &CORBA::_tc_VersionSpec },
+    { "base_interfaces", &CORBA::_tc_RepositoryIdSeq }
+    
+  };
+static TAO::TypeCode::Struct<char const *,
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_InterfaceDescription (
+    CORBA::tk_struct,
+    "IDL:omg.org/CORBA/InterfaceDescription:1.0",
+    "InterfaceDescription",
+    _tao_fields_CORBA_InterfaceDescription,
+    5);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_InterfaceDescription =
+    &_tao_tc_CORBA_InterfaceDescription;
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
@@ -7055,6 +8211,50 @@ TAO::Collocation_Proxy_Broker *
     CORBA::Object_ptr obj
   ) = 0;
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_InterfaceAttrExtension_ExtFullInterfaceDescription[] =
+  {
+    { "name", &CORBA::_tc_Identifier },
+    { "id", &CORBA::_tc_RepositoryId },
+    { "defined_in", &CORBA::_tc_RepositoryId },
+    { "version", &CORBA::_tc_VersionSpec },
+    { "operations", &CORBA::_tc_OpDescriptionSeq },
+    { "attributes", &CORBA::_tc_ExtAttrDescriptionSeq },
+    { "base_interfaces", &CORBA::_tc_RepositoryIdSeq },
+    { "type", &CORBA::_tc_TypeCode }
+    
+  };
+static TAO::TypeCode::Struct<char const *,
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_InterfaceAttrExtension_ExtFullInterfaceDescription (
+    CORBA::tk_struct,
+    "IDL:omg.org/CORBA/InterfaceAttrExtension/ExtFullInterfaceDescription:1.0",
+    "ExtFullInterfaceDescription",
+    _tao_fields_CORBA_InterfaceAttrExtension_ExtFullInterfaceDescription,
+    8);
+  
+::CORBA::TypeCode_ptr const CORBA::InterfaceAttrExtension::_tc_ExtFullInterfaceDescription =
+  &_tao_tc_CORBA_InterfaceAttrExtension_ExtFullInterfaceDescription;
+
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
@@ -7088,7 +8288,7 @@ CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription::_tao_any_destructor
       CORBA_InterfaceAttrExtension_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -7137,14 +8337,14 @@ CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription::_tao_any_destructor
       CORBA_InterfaceAttrExtension_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ExtAttributeDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_type (type);
-  TAO::Arg_Traits< CORBA::AttributeMode>::in_arg_val _tao_mode (mode);
-  TAO::Arg_Traits< CORBA::ExceptionDefSeq>::in_arg_val _tao_get_exceptions (get_exceptions);
-  TAO::Arg_Traits< CORBA::ExceptionDefSeq>::in_arg_val _tao_set_exceptions (set_exceptions);
+  TAO::Arg_Traits< ::CORBA::ExtAttributeDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type (type);
+  TAO::Arg_Traits< ::CORBA::AttributeMode>::in_arg_val _tao_mode (mode);
+  TAO::Arg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_get_exceptions (get_exceptions);
+  TAO::Arg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_set_exceptions (set_exceptions);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -7287,6 +8487,24 @@ CORBA::InterfaceAttrExtension::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_InterfaceAttrExtension (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/InterfaceAttrExtension:1.0",
+    "InterfaceAttrExtension");
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_InterfaceAttrExtension =
+    &_tao_tc_CORBA_InterfaceAttrExtension;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::ExtInterfaceDef.
@@ -7469,6 +8687,24 @@ CORBA::ExtInterfaceDef::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ExtInterfaceDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/ExtInterfaceDef:1.0",
+    "ExtInterfaceDef");
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ExtInterfaceDef =
+    &_tao_tc_CORBA_ExtInterfaceDef;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::AbstractInterfaceDef.
@@ -7646,6 +8882,24 @@ CORBA::AbstractInterfaceDef::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_AbstractInterfaceDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/AbstractInterfaceDef:1.0",
+    "AbstractInterfaceDef");
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_AbstractInterfaceDef =
+    &_tao_tc_CORBA_AbstractInterfaceDef;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::ExtAbstractInterfaceDef.
@@ -7832,6 +9086,24 @@ CORBA::ExtAbstractInterfaceDef::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ExtAbstractInterfaceDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/ExtAbstractInterfaceDef:1.0",
+    "ExtAbstractInterfaceDef");
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ExtAbstractInterfaceDef =
+    &_tao_tc_CORBA_ExtAbstractInterfaceDef;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::LocalInterfaceDef.
@@ -8009,6 +9281,24 @@ CORBA::LocalInterfaceDef::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_LocalInterfaceDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/LocalInterfaceDef:1.0",
+    "LocalInterfaceDef");
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_LocalInterfaceDef =
+    &_tao_tc_CORBA_LocalInterfaceDef;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::ExtLocalInterfaceDef.
@@ -8195,6 +9485,2435 @@ CORBA::ExtLocalInterfaceDef::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ExtLocalInterfaceDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/ExtLocalInterfaceDef:1.0",
+    "ExtLocalInterfaceDef");
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ExtLocalInterfaceDef =
+    &_tao_tc_CORBA_ExtLocalInterfaceDef;
+}
+
+
+
+// TAO_IDL - Generated from
+// 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 
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::Repository>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::Repository_ptr _tao_elem
+  )
+{
+  CORBA::Repository_ptr _tao_objptr =
+    CORBA::Repository::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::Repository_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::Repository>::insert (
+      _tao_any,
+      CORBA::Repository::_tao_any_destructor,
+      CORBA::_tc_Repository,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::Repository_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::Repository>::extract (
+        _tao_any,
+        CORBA::Repository::_tao_any_destructor,
+        CORBA::_tc_Repository,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::ModuleDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ModuleDef_ptr _tao_elem
+  )
+{
+  CORBA::ModuleDef_ptr _tao_objptr =
+    CORBA::ModuleDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ModuleDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::ModuleDef>::insert (
+      _tao_any,
+      CORBA::ModuleDef::_tao_any_destructor,
+      CORBA::_tc_ModuleDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ModuleDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::ModuleDef>::extract (
+        _tao_any,
+        CORBA::ModuleDef::_tao_any_destructor,
+        CORBA::_tc_ModuleDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ModuleDescription &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ModuleDescription>::insert_copy (
+      _tao_any,
+      CORBA::ModuleDescription::_tao_any_destructor,
+      CORBA::_tc_ModuleDescription,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ModuleDescription *_tao_elem
+  )
+{
+  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).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ModuleDescription *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::ModuleDescription *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ModuleDescription *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ModuleDescription>::extract (
+        _tao_any,
+        CORBA::ModuleDescription::_tao_any_destructor,
+        CORBA::_tc_ModuleDescription,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::ConstantDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ConstantDef_ptr _tao_elem
+  )
+{
+  CORBA::ConstantDef_ptr _tao_objptr =
+    CORBA::ConstantDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ConstantDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::ConstantDef>::insert (
+      _tao_any,
+      CORBA::ConstantDef::_tao_any_destructor,
+      CORBA::_tc_ConstantDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ConstantDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::ConstantDef>::extract (
+        _tao_any,
+        CORBA::ConstantDef::_tao_any_destructor,
+        CORBA::_tc_ConstantDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ConstantDescription &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ConstantDescription>::insert_copy (
+      _tao_any,
+      CORBA::ConstantDescription::_tao_any_destructor,
+      CORBA::_tc_ConstantDescription,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ConstantDescription *_tao_elem
+  )
+{
+  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).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ConstantDescription *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::ConstantDescription *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ConstantDescription *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ConstantDescription>::extract (
+        _tao_any,
+        CORBA::ConstantDescription::_tao_any_destructor,
+        CORBA::_tc_ConstantDescription,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::StructDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::StructDef_ptr _tao_elem
+  )
+{
+  CORBA::StructDef_ptr _tao_objptr =
+    CORBA::StructDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::StructDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::StructDef>::insert (
+      _tao_any,
+      CORBA::StructDef::_tao_any_destructor,
+      CORBA::_tc_StructDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::StructDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::StructDef>::extract (
+        _tao_any,
+        CORBA::StructDef::_tao_any_destructor,
+        CORBA::_tc_StructDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::UnionDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::UnionDef_ptr _tao_elem
+  )
+{
+  CORBA::UnionDef_ptr _tao_objptr =
+    CORBA::UnionDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::UnionDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::UnionDef>::insert (
+      _tao_any,
+      CORBA::UnionDef::_tao_any_destructor,
+      CORBA::_tc_UnionDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::UnionDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::UnionDef>::extract (
+        _tao_any,
+        CORBA::UnionDef::_tao_any_destructor,
+        CORBA::_tc_UnionDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::EnumDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::EnumDef_ptr _tao_elem
+  )
+{
+  CORBA::EnumDef_ptr _tao_objptr =
+    CORBA::EnumDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::EnumDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::EnumDef>::insert (
+      _tao_any,
+      CORBA::EnumDef::_tao_any_destructor,
+      CORBA::_tc_EnumDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::EnumDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::EnumDef>::extract (
+        _tao_any,
+        CORBA::EnumDef::_tao_any_destructor,
+        CORBA::_tc_EnumDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::AliasDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::AliasDef_ptr _tao_elem
+  )
+{
+  CORBA::AliasDef_ptr _tao_objptr =
+    CORBA::AliasDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::AliasDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::AliasDef>::insert (
+      _tao_any,
+      CORBA::AliasDef::_tao_any_destructor,
+      CORBA::_tc_AliasDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::AliasDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::AliasDef>::extract (
+        _tao_any,
+        CORBA::AliasDef::_tao_any_destructor,
+        CORBA::_tc_AliasDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::NativeDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::NativeDef_ptr _tao_elem
+  )
+{
+  CORBA::NativeDef_ptr _tao_objptr =
+    CORBA::NativeDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::NativeDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::NativeDef>::insert (
+      _tao_any,
+      CORBA::NativeDef::_tao_any_destructor,
+      CORBA::_tc_NativeDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::NativeDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::NativeDef>::extract (
+        _tao_any,
+        CORBA::NativeDef::_tao_any_destructor,
+        CORBA::_tc_NativeDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::PrimitiveDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::PrimitiveDef_ptr _tao_elem
+  )
+{
+  CORBA::PrimitiveDef_ptr _tao_objptr =
+    CORBA::PrimitiveDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::PrimitiveDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::PrimitiveDef>::insert (
+      _tao_any,
+      CORBA::PrimitiveDef::_tao_any_destructor,
+      CORBA::_tc_PrimitiveDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::PrimitiveDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::PrimitiveDef>::extract (
+        _tao_any,
+        CORBA::PrimitiveDef::_tao_any_destructor,
+        CORBA::_tc_PrimitiveDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::StringDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::StringDef_ptr _tao_elem
+  )
+{
+  CORBA::StringDef_ptr _tao_objptr =
+    CORBA::StringDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::StringDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::StringDef>::insert (
+      _tao_any,
+      CORBA::StringDef::_tao_any_destructor,
+      CORBA::_tc_StringDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::StringDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::StringDef>::extract (
+        _tao_any,
+        CORBA::StringDef::_tao_any_destructor,
+        CORBA::_tc_StringDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::WstringDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::WstringDef_ptr _tao_elem
+  )
+{
+  CORBA::WstringDef_ptr _tao_objptr =
+    CORBA::WstringDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::WstringDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::WstringDef>::insert (
+      _tao_any,
+      CORBA::WstringDef::_tao_any_destructor,
+      CORBA::_tc_WstringDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::WstringDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::WstringDef>::extract (
+        _tao_any,
+        CORBA::WstringDef::_tao_any_destructor,
+        CORBA::_tc_WstringDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::SequenceDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::SequenceDef_ptr _tao_elem
+  )
+{
+  CORBA::SequenceDef_ptr _tao_objptr =
+    CORBA::SequenceDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::SequenceDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::SequenceDef>::insert (
+      _tao_any,
+      CORBA::SequenceDef::_tao_any_destructor,
+      CORBA::_tc_SequenceDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::SequenceDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::SequenceDef>::extract (
+        _tao_any,
+        CORBA::SequenceDef::_tao_any_destructor,
+        CORBA::_tc_SequenceDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::ArrayDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ArrayDef_ptr _tao_elem
+  )
+{
+  CORBA::ArrayDef_ptr _tao_objptr =
+    CORBA::ArrayDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ArrayDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::ArrayDef>::insert (
+      _tao_any,
+      CORBA::ArrayDef::_tao_any_destructor,
+      CORBA::_tc_ArrayDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ArrayDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::ArrayDef>::extract (
+        _tao_any,
+        CORBA::ArrayDef::_tao_any_destructor,
+        CORBA::_tc_ArrayDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::ExceptionDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ExceptionDef_ptr _tao_elem
+  )
+{
+  CORBA::ExceptionDef_ptr _tao_objptr =
+    CORBA::ExceptionDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ExceptionDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::ExceptionDef>::insert (
+      _tao_any,
+      CORBA::ExceptionDef::_tao_any_destructor,
+      CORBA::_tc_ExceptionDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ExceptionDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::ExceptionDef>::extract (
+        _tao_any,
+        CORBA::ExceptionDef::_tao_any_destructor,
+        CORBA::_tc_ExceptionDef,
+        _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::ExceptionDefSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ExceptionDefSeq>::insert_copy (
+      _tao_any,
+      CORBA::ExceptionDefSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ExceptionDefSeq_0,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ExceptionDefSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ExceptionDefSeq>::insert (
+      _tao_any,
+      CORBA::ExceptionDefSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ExceptionDefSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ExceptionDefSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::ExceptionDefSeq *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ExceptionDefSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ExceptionDefSeq>::extract (
+        _tao_any,
+        CORBA::ExceptionDefSeq::_tao_any_destructor,
+        TAO::TypeCode::tc_CORBA_ExceptionDefSeq_0,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/any_op_cs.cpp:52
+
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::AttributeMode _tao_elem
+  )
+{
+  TAO::Any_Basic_Impl_T<CORBA::AttributeMode>::insert (
+      _tao_any,
+      CORBA::_tc_AttributeMode,
+      _tao_elem
+    );
+}
+
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::AttributeMode &_tao_elem
+  )
+{
+  return
+    TAO::Any_Basic_Impl_T<CORBA::AttributeMode>::extract (
+        _tao_any,
+        CORBA::_tc_AttributeMode,
+        _tao_elem 
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::AttributeDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::AttributeDef_ptr _tao_elem
+  )
+{
+  CORBA::AttributeDef_ptr _tao_objptr =
+    CORBA::AttributeDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::AttributeDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::AttributeDef>::insert (
+      _tao_any,
+      CORBA::AttributeDef::_tao_any_destructor,
+      CORBA::_tc_AttributeDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::AttributeDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::AttributeDef>::extract (
+        _tao_any,
+        CORBA::AttributeDef::_tao_any_destructor,
+        CORBA::_tc_AttributeDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::AttributeDescription &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::AttributeDescription>::insert_copy (
+      _tao_any,
+      CORBA::AttributeDescription::_tao_any_destructor,
+      CORBA::_tc_AttributeDescription,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::AttributeDescription *_tao_elem
+  )
+{
+  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).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::AttributeDescription *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::AttributeDescription *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::AttributeDescription *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::AttributeDescription>::extract (
+        _tao_any,
+        CORBA::AttributeDescription::_tao_any_destructor,
+        CORBA::_tc_AttributeDescription,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// 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 >>= 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
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::ExtAttributeDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ExtAttributeDef_ptr _tao_elem
+  )
+{
+  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::ExtAttributeDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::ExtAttributeDef>::extract (
+        _tao_any,
+        CORBA::ExtAttributeDef::_tao_any_destructor,
+        CORBA::_tc_ExtAttributeDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/any_op_cs.cpp:52
+
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::OperationMode _tao_elem
+  )
+{
+  TAO::Any_Basic_Impl_T<CORBA::OperationMode>::insert (
+      _tao_any,
+      CORBA::_tc_OperationMode,
+      _tao_elem
+    );
+}
+
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::OperationMode &_tao_elem
+  )
+{
+  return
+    TAO::Any_Basic_Impl_T<CORBA::OperationMode>::extract (
+        _tao_any,
+        CORBA::_tc_OperationMode,
+        _tao_elem 
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ParameterDescription &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ParameterDescription>::insert_copy (
+      _tao_any,
+      CORBA::ParameterDescription::_tao_any_destructor,
+      CORBA::_tc_ParameterDescription,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ParameterDescription *_tao_elem
+  )
+{
+  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).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ParameterDescription *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::ParameterDescription *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ParameterDescription *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ParameterDescription>::extract (
+        _tao_any,
+        CORBA::ParameterDescription::_tao_any_destructor,
+        CORBA::_tc_ParameterDescription,
+        _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::ParDescriptionSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ParDescriptionSeq>::insert_copy (
+      _tao_any,
+      CORBA::ParDescriptionSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ParDescriptionSeq_0,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ParDescriptionSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ParDescriptionSeq>::insert (
+      _tao_any,
+      CORBA::ParDescriptionSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ParDescriptionSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ParDescriptionSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::ParDescriptionSeq *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ParDescriptionSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ParDescriptionSeq>::extract (
+        _tao_any,
+        CORBA::ParDescriptionSeq::_tao_any_destructor,
+        TAO::TypeCode::tc_CORBA_ParDescriptionSeq_0,
+        _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::ContextIdSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ContextIdSeq>::insert_copy (
+      _tao_any,
+      CORBA::ContextIdSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ContextIdSeq_0,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ContextIdSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ContextIdSeq>::insert (
+      _tao_any,
+      CORBA::ContextIdSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ContextIdSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ContextIdSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::ContextIdSeq *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ContextIdSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ContextIdSeq>::extract (
+        _tao_any,
+        CORBA::ContextIdSeq::_tao_any_destructor,
+        TAO::TypeCode::tc_CORBA_ContextIdSeq_0,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::OperationDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::OperationDef_ptr _tao_elem
+  )
+{
+  CORBA::OperationDef_ptr _tao_objptr =
+    CORBA::OperationDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::OperationDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::OperationDef>::insert (
+      _tao_any,
+      CORBA::OperationDef::_tao_any_destructor,
+      CORBA::_tc_OperationDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::OperationDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::OperationDef>::extract (
+        _tao_any,
+        CORBA::OperationDef::_tao_any_destructor,
+        CORBA::_tc_OperationDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::OperationDescription &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::OperationDescription>::insert_copy (
+      _tao_any,
+      CORBA::OperationDescription::_tao_any_destructor,
+      CORBA::_tc_OperationDescription,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::OperationDescription *_tao_elem
+  )
+{
+  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).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::OperationDescription *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::OperationDescription *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::OperationDescription *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::OperationDescription>::extract (
+        _tao_any,
+        CORBA::OperationDescription::_tao_any_destructor,
+        CORBA::_tc_OperationDescription,
+        _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::RepositoryIdSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::RepositoryIdSeq>::insert_copy (
+      _tao_any,
+      CORBA::RepositoryIdSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_RepositoryIdSeq_0,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::RepositoryIdSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::RepositoryIdSeq>::insert (
+      _tao_any,
+      CORBA::RepositoryIdSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_RepositoryIdSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::RepositoryIdSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::RepositoryIdSeq *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::RepositoryIdSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::RepositoryIdSeq>::extract (
+        _tao_any,
+        CORBA::RepositoryIdSeq::_tao_any_destructor,
+        TAO::TypeCode::tc_CORBA_RepositoryIdSeq_0,
+        _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::OpDescriptionSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::OpDescriptionSeq>::insert_copy (
+      _tao_any,
+      CORBA::OpDescriptionSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_OpDescriptionSeq_0,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::OpDescriptionSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::OpDescriptionSeq>::insert (
+      _tao_any,
+      CORBA::OpDescriptionSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_OpDescriptionSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::OpDescriptionSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::OpDescriptionSeq *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::OpDescriptionSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::OpDescriptionSeq>::extract (
+        _tao_any,
+        CORBA::OpDescriptionSeq::_tao_any_destructor,
+        TAO::TypeCode::tc_CORBA_OpDescriptionSeq_0,
+        _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::AttrDescriptionSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::AttrDescriptionSeq>::insert_copy (
+      _tao_any,
+      CORBA::AttrDescriptionSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_AttrDescriptionSeq_0,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::AttrDescriptionSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::AttrDescriptionSeq>::insert (
+      _tao_any,
+      CORBA::AttrDescriptionSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_AttrDescriptionSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::AttrDescriptionSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::AttrDescriptionSeq *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::AttrDescriptionSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::AttrDescriptionSeq>::extract (
+        _tao_any,
+        CORBA::AttrDescriptionSeq::_tao_any_destructor,
+        TAO::TypeCode::tc_CORBA_AttrDescriptionSeq_0,
+        _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::ExtAttrDescriptionSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ExtAttrDescriptionSeq>::insert_copy (
+      _tao_any,
+      CORBA::ExtAttrDescriptionSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ExtAttrDescriptionSeq_0,
+      _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,
+      TAO::TypeCode::tc_CORBA_ExtAttrDescriptionSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ExtAttrDescriptionSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= 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,
+        TAO::TypeCode::tc_CORBA_ExtAttrDescriptionSeq_0,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::InterfaceDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::InterfaceDef_ptr _tao_elem
+  )
+{
+  CORBA::InterfaceDef_ptr _tao_objptr =
+    CORBA::InterfaceDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::InterfaceDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::InterfaceDef>::insert (
+      _tao_any,
+      CORBA::InterfaceDef::_tao_any_destructor,
+      CORBA::_tc_InterfaceDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::InterfaceDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::InterfaceDef>::extract (
+        _tao_any,
+        CORBA::InterfaceDef::_tao_any_destructor,
+        CORBA::_tc_InterfaceDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::InterfaceDef::FullInterfaceDescription &_tao_elem
+  )
+{
+  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.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::InterfaceDef::FullInterfaceDescription *_tao_elem
+  )
+{
+  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).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::InterfaceDef::FullInterfaceDescription *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::InterfaceDef::FullInterfaceDescription *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::InterfaceDef::FullInterfaceDescription *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::InterfaceDef::FullInterfaceDescription>::extract (
+        _tao_any,
+        CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor,
+        CORBA::InterfaceDef::_tc_FullInterfaceDescription,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::InterfaceDescription &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::InterfaceDescription>::insert_copy (
+      _tao_any,
+      CORBA::InterfaceDescription::_tao_any_destructor,
+      CORBA::_tc_InterfaceDescription,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::InterfaceDescription *_tao_elem
+  )
+{
+  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).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::InterfaceDescription *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::InterfaceDescription *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::InterfaceDescription *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::InterfaceDescription>::extract (
+        _tao_any,
+        CORBA::InterfaceDescription::_tao_any_destructor,
+        CORBA::_tc_InterfaceDescription,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::InterfaceAttrExtension>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// 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
+      );
+}
+
+// TAO_IDL - Generated from 
+// 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 >>= 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
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::ExtInterfaceDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// 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
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::AbstractInterfaceDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::AbstractInterfaceDef_ptr _tao_elem
+  )
+{
+  CORBA::AbstractInterfaceDef_ptr _tao_objptr =
+    CORBA::AbstractInterfaceDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::AbstractInterfaceDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::AbstractInterfaceDef>::insert (
+      _tao_any,
+      CORBA::AbstractInterfaceDef::_tao_any_destructor,
+      CORBA::_tc_AbstractInterfaceDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::AbstractInterfaceDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::AbstractInterfaceDef>::extract (
+        _tao_any,
+        CORBA::AbstractInterfaceDef::_tao_any_destructor,
+        CORBA::_tc_AbstractInterfaceDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::ExtAbstractInterfaceDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// 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
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::LocalInterfaceDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::LocalInterfaceDef_ptr _tao_elem
+  )
+{
+  CORBA::LocalInterfaceDef_ptr _tao_objptr =
+    CORBA::LocalInterfaceDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::LocalInterfaceDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::LocalInterfaceDef>::insert (
+      _tao_any,
+      CORBA::LocalInterfaceDef::_tao_any_destructor,
+      CORBA::_tc_LocalInterfaceDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::LocalInterfaceDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::LocalInterfaceDef>::extract (
+        _tao_any,
+        CORBA::LocalInterfaceDef::_tao_any_destructor,
+        CORBA::_tc_LocalInterfaceDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::ExtLocalInterfaceDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// 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
+      );
+}
+
+// TAO_IDL - Generated from
 // be\be_visitor_enum/cdr_op_cs.cpp:51
 
 CORBA::Boolean operator<< (TAO_OutputCDR & strm, CORBA::PrimitiveKind _tao_enumerator)
diff --git a/TAO/tao/IFR_Client/IFR_BasicC.h b/TAO/tao/IFR_Client/IFR_BasicC.h
index 31ebfd4e2c4..4284fac3152 100644
--- a/TAO/tao/IFR_Client/IFR_BasicC.h
+++ b/TAO/tao/IFR_Client/IFR_BasicC.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
 #ifndef _TAO_IDL_ORIG_IFR_BASICC_H_
 #define _TAO_IDL_ORIG_IFR_BASICC_H_
@@ -45,9 +45,10 @@
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
-#include "tao/TypeCode.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Any.h"
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/Sequence_T.h"
 #include "tao/Objref_VarOut_T.h"
 #include "tao/Seq_Var_T.h"
@@ -256,7 +257,7 @@ namespace CORBA
   typedef PrimitiveKind &PrimitiveKind_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_PrimitiveKind;
   
@@ -457,7 +458,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_Repository;
   
@@ -568,7 +569,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ModuleDef;
   
@@ -591,7 +592,7 @@ namespace CORBA
     ModuleDescription_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
+  // be\be_visitor_structure/structure_ch.cpp:57
   
   struct TAO_IFR_Client_Export ModuleDescription
   {
@@ -605,7 +606,7 @@ namespace CORBA
   };
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ModuleDescription;
   
@@ -767,7 +768,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ConstantDef;
   
@@ -790,7 +791,7 @@ namespace CORBA
     ConstantDescription_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
+  // be\be_visitor_structure/structure_ch.cpp:57
   
   struct TAO_IFR_Client_Export ConstantDescription
   {
@@ -806,7 +807,7 @@ namespace CORBA
   };
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ConstantDescription;
   
@@ -938,7 +939,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_StructDef;
   
@@ -1101,7 +1102,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_UnionDef;
   
@@ -1232,7 +1233,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_EnumDef;
   
@@ -1363,7 +1364,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_AliasDef;
   
@@ -1473,7 +1474,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_NativeDef;
   
@@ -1570,7 +1571,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_PrimitiveDef;
   
@@ -1678,7 +1679,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_StringDef;
   
@@ -1786,7 +1787,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_WstringDef;
   
@@ -1925,7 +1926,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_SequenceDef;
   
@@ -2064,7 +2065,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ArrayDef;
   
@@ -2206,7 +2207,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExceptionDef;
   
@@ -2266,7 +2267,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExceptionDefSeq;
   
@@ -2282,7 +2283,7 @@ namespace CORBA
   typedef AttributeMode &AttributeMode_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_AttributeMode;
   
@@ -2444,7 +2445,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_AttributeDef;
   
@@ -2467,7 +2468,7 @@ namespace CORBA
     AttributeDescription_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
+  // be\be_visitor_structure/structure_ch.cpp:57
   
   struct TAO_IFR_Client_Export AttributeDescription
   {
@@ -2483,7 +2484,7 @@ namespace CORBA
   };
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_AttributeDescription;
   
@@ -2506,7 +2507,7 @@ namespace CORBA
     ExtAttributeDescription_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
+  // be\be_visitor_structure/structure_ch.cpp:57
   
   struct TAO_IFR_Client_Export ExtAttributeDescription
   {
@@ -2524,7 +2525,7 @@ namespace CORBA
   };
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExtAttributeDescription;
   
@@ -2686,7 +2687,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExtAttributeDef;
   
@@ -2702,7 +2703,7 @@ namespace CORBA
   typedef OperationMode &OperationMode_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_OperationMode;
   
@@ -2725,7 +2726,7 @@ namespace CORBA
     ParameterDescription_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
+  // be\be_visitor_structure/structure_ch.cpp:57
   
   struct TAO_IFR_Client_Export ParameterDescription
   {
@@ -2739,7 +2740,7 @@ namespace CORBA
   };
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ParameterDescription;
   
@@ -2792,7 +2793,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ParDescriptionSeq;
   
@@ -2804,7 +2805,7 @@ namespace CORBA
   typedef CORBA::String_out ContextIdentifier_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ContextIdentifier;
   
@@ -2855,7 +2856,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ContextIdSeq;
   
@@ -3080,7 +3081,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_OperationDef;
   
@@ -3103,7 +3104,7 @@ namespace CORBA
     OperationDescription_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
+  // be\be_visitor_structure/structure_ch.cpp:57
   
   struct TAO_IFR_Client_Export OperationDescription
   {
@@ -3122,7 +3123,7 @@ namespace CORBA
   };
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_OperationDescription;
   
@@ -3173,7 +3174,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_RepositoryIdSeq;
   
@@ -3226,7 +3227,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_OpDescriptionSeq;
   
@@ -3279,7 +3280,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_AttrDescriptionSeq;
   
@@ -3332,7 +3333,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExtAttrDescriptionSeq;
   
@@ -3448,7 +3449,7 @@ namespace CORBA
       FullInterfaceDescription_out;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_structure/structure_ch.cpp:52
+    // be\be_visitor_structure/structure_ch.cpp:57
     
     struct TAO_IFR_Client_Export FullInterfaceDescription
     {
@@ -3466,7 +3467,7 @@ namespace CORBA
     };
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     static ::CORBA::TypeCode_ptr const _tc_FullInterfaceDescription;
     
@@ -3560,7 +3561,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_InterfaceDef;
   
@@ -3583,7 +3584,7 @@ namespace CORBA
     InterfaceDescription_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
+  // be\be_visitor_structure/structure_ch.cpp:57
   
   struct TAO_IFR_Client_Export InterfaceDescription
   {
@@ -3598,7 +3599,7 @@ namespace CORBA
   };
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_InterfaceDescription;
   
@@ -3680,7 +3681,7 @@ namespace CORBA
       ExtFullInterfaceDescription_out;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_structure/structure_ch.cpp:52
+    // be\be_visitor_structure/structure_ch.cpp:57
     
     struct TAO_IFR_Client_Export ExtFullInterfaceDescription
     {
@@ -3698,7 +3699,7 @@ namespace CORBA
     };
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     static ::CORBA::TypeCode_ptr const _tc_ExtFullInterfaceDescription;
     
@@ -3776,7 +3777,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_InterfaceAttrExtension;
   
@@ -3887,7 +3888,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExtInterfaceDef;
   
@@ -3997,7 +3998,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_AbstractInterfaceDef;
   
@@ -4108,7 +4109,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExtAbstractInterfaceDef;
   
@@ -4218,7 +4219,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_LocalInterfaceDef;
   
@@ -4329,7 +4330,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExtLocalInterfaceDef;
 
@@ -4494,8 +4495,29 @@ TAO::Collocation_Proxy_Broker *
 namespace TAO
 {
 
-#if !defined (_CORBA_REPOSITORY__TRAITS_CH_)
-#define _CORBA_REPOSITORY__TRAITS_CH_
+#if !defined (_CORBA_FIXEDDEF__TRAITS_)
+#define _CORBA_FIXEDDEF__TRAITS_
+  
+  template<>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::FixedDef>
+  {
+    static ::CORBA::FixedDef_ptr duplicate (
+        ::CORBA::FixedDef_ptr
+      );
+    static void release (
+        ::CORBA::FixedDef_ptr
+      );
+    static ::CORBA::FixedDef_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::CORBA::FixedDef_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_REPOSITORY__TRAITS_)
+#define _CORBA_REPOSITORY__TRAITS_
   
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::Repository>
@@ -4515,8 +4537,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_MODULEDEF__TRAITS_CH_)
-#define _CORBA_MODULEDEF__TRAITS_CH_
+#if !defined (_CORBA_MODULEDEF__TRAITS_)
+#define _CORBA_MODULEDEF__TRAITS_
   
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ModuleDef>
@@ -4536,8 +4558,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_CONSTANTDEF__TRAITS_CH_)
-#define _CORBA_CONSTANTDEF__TRAITS_CH_
+#if !defined (_CORBA_CONSTANTDEF__TRAITS_)
+#define _CORBA_CONSTANTDEF__TRAITS_
   
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ConstantDef>
@@ -4557,8 +4579,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_STRUCTDEF__TRAITS_CH_)
-#define _CORBA_STRUCTDEF__TRAITS_CH_
+#if !defined (_CORBA_STRUCTDEF__TRAITS_)
+#define _CORBA_STRUCTDEF__TRAITS_
   
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::StructDef>
@@ -4578,8 +4600,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_UNIONDEF__TRAITS_CH_)
-#define _CORBA_UNIONDEF__TRAITS_CH_
+#if !defined (_CORBA_UNIONDEF__TRAITS_)
+#define _CORBA_UNIONDEF__TRAITS_
   
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::UnionDef>
@@ -4599,8 +4621,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_ENUMDEF__TRAITS_CH_)
-#define _CORBA_ENUMDEF__TRAITS_CH_
+#if !defined (_CORBA_ENUMDEF__TRAITS_)
+#define _CORBA_ENUMDEF__TRAITS_
   
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::EnumDef>
@@ -4620,8 +4642,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_ALIASDEF__TRAITS_CH_)
-#define _CORBA_ALIASDEF__TRAITS_CH_
+#if !defined (_CORBA_ALIASDEF__TRAITS_)
+#define _CORBA_ALIASDEF__TRAITS_
   
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::AliasDef>
@@ -4641,357 +4663,357 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_INTERFACEDEF__TRAITS_CH_)
-#define _CORBA_INTERFACEDEF__TRAITS_CH_
+#if !defined (_CORBA_NATIVEDEF__TRAITS_)
+#define _CORBA_NATIVEDEF__TRAITS_
   
   template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::InterfaceDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::NativeDef>
   {
-    static ::CORBA::InterfaceDef_ptr duplicate (
-        ::CORBA::InterfaceDef_ptr
+    static ::CORBA::NativeDef_ptr duplicate (
+        ::CORBA::NativeDef_ptr
       );
     static void release (
-        ::CORBA::InterfaceDef_ptr
+        ::CORBA::NativeDef_ptr
       );
-    static ::CORBA::InterfaceDef_ptr nil (void);
+    static ::CORBA::NativeDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::InterfaceDef_ptr p,
+        ::CORBA::NativeDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_EXCEPTIONDEF__TRAITS_CH_)
-#define _CORBA_EXCEPTIONDEF__TRAITS_CH_
+#if !defined (_CORBA_PRIMITIVEDEF__TRAITS_)
+#define _CORBA_PRIMITIVEDEF__TRAITS_
   
   template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExceptionDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::PrimitiveDef>
   {
-    static ::CORBA::ExceptionDef_ptr duplicate (
-        ::CORBA::ExceptionDef_ptr
+    static ::CORBA::PrimitiveDef_ptr duplicate (
+        ::CORBA::PrimitiveDef_ptr
       );
     static void release (
-        ::CORBA::ExceptionDef_ptr
+        ::CORBA::PrimitiveDef_ptr
       );
-    static ::CORBA::ExceptionDef_ptr nil (void);
+    static ::CORBA::PrimitiveDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::ExceptionDef_ptr p,
+        ::CORBA::PrimitiveDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_NATIVEDEF__TRAITS_CH_)
-#define _CORBA_NATIVEDEF__TRAITS_CH_
+#if !defined (_CORBA_STRINGDEF__TRAITS_)
+#define _CORBA_STRINGDEF__TRAITS_
   
   template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::NativeDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::StringDef>
   {
-    static ::CORBA::NativeDef_ptr duplicate (
-        ::CORBA::NativeDef_ptr
+    static ::CORBA::StringDef_ptr duplicate (
+        ::CORBA::StringDef_ptr
       );
     static void release (
-        ::CORBA::NativeDef_ptr
+        ::CORBA::StringDef_ptr
       );
-    static ::CORBA::NativeDef_ptr nil (void);
+    static ::CORBA::StringDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::NativeDef_ptr p,
+        ::CORBA::StringDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_ABSTRACTINTERFACEDEF__TRAITS_CH_)
-#define _CORBA_ABSTRACTINTERFACEDEF__TRAITS_CH_
+#if !defined (_CORBA_WSTRINGDEF__TRAITS_)
+#define _CORBA_WSTRINGDEF__TRAITS_
   
   template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::AbstractInterfaceDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::WstringDef>
   {
-    static ::CORBA::AbstractInterfaceDef_ptr duplicate (
-        ::CORBA::AbstractInterfaceDef_ptr
+    static ::CORBA::WstringDef_ptr duplicate (
+        ::CORBA::WstringDef_ptr
       );
     static void release (
-        ::CORBA::AbstractInterfaceDef_ptr
+        ::CORBA::WstringDef_ptr
       );
-    static ::CORBA::AbstractInterfaceDef_ptr nil (void);
+    static ::CORBA::WstringDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::AbstractInterfaceDef_ptr p,
+        ::CORBA::WstringDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_LOCALINTERFACEDEF__TRAITS_CH_)
-#define _CORBA_LOCALINTERFACEDEF__TRAITS_CH_
+#if !defined (_CORBA_SEQUENCEDEF__TRAITS_)
+#define _CORBA_SEQUENCEDEF__TRAITS_
   
   template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::LocalInterfaceDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::SequenceDef>
   {
-    static ::CORBA::LocalInterfaceDef_ptr duplicate (
-        ::CORBA::LocalInterfaceDef_ptr
+    static ::CORBA::SequenceDef_ptr duplicate (
+        ::CORBA::SequenceDef_ptr
       );
     static void release (
-        ::CORBA::LocalInterfaceDef_ptr
+        ::CORBA::SequenceDef_ptr
       );
-    static ::CORBA::LocalInterfaceDef_ptr nil (void);
+    static ::CORBA::SequenceDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::LocalInterfaceDef_ptr p,
+        ::CORBA::SequenceDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_EXTINTERFACEDEF__TRAITS_CH_)
-#define _CORBA_EXTINTERFACEDEF__TRAITS_CH_
+#if !defined (_CORBA_ARRAYDEF__TRAITS_)
+#define _CORBA_ARRAYDEF__TRAITS_
   
   template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExtInterfaceDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ArrayDef>
   {
-    static ::CORBA::ExtInterfaceDef_ptr duplicate (
-        ::CORBA::ExtInterfaceDef_ptr
+    static ::CORBA::ArrayDef_ptr duplicate (
+        ::CORBA::ArrayDef_ptr
       );
     static void release (
-        ::CORBA::ExtInterfaceDef_ptr
+        ::CORBA::ArrayDef_ptr
       );
-    static ::CORBA::ExtInterfaceDef_ptr nil (void);
+    static ::CORBA::ArrayDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::ExtInterfaceDef_ptr p,
+        ::CORBA::ArrayDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_EXTABSTRACTINTERFACEDEF__TRAITS_CH_)
-#define _CORBA_EXTABSTRACTINTERFACEDEF__TRAITS_CH_
+#if !defined (_CORBA_EXCEPTIONDEF__TRAITS_)
+#define _CORBA_EXCEPTIONDEF__TRAITS_
   
   template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExtAbstractInterfaceDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExceptionDef>
   {
-    static ::CORBA::ExtAbstractInterfaceDef_ptr duplicate (
-        ::CORBA::ExtAbstractInterfaceDef_ptr
+    static ::CORBA::ExceptionDef_ptr duplicate (
+        ::CORBA::ExceptionDef_ptr
       );
     static void release (
-        ::CORBA::ExtAbstractInterfaceDef_ptr
+        ::CORBA::ExceptionDef_ptr
       );
-    static ::CORBA::ExtAbstractInterfaceDef_ptr nil (void);
+    static ::CORBA::ExceptionDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::ExtAbstractInterfaceDef_ptr p,
+        ::CORBA::ExceptionDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_EXTLOCALINTERFACEDEF__TRAITS_CH_)
-#define _CORBA_EXTLOCALINTERFACEDEF__TRAITS_CH_
+#if !defined (_CORBA_ATTRIBUTEDEF__TRAITS_)
+#define _CORBA_ATTRIBUTEDEF__TRAITS_
   
   template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExtLocalInterfaceDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::AttributeDef>
   {
-    static ::CORBA::ExtLocalInterfaceDef_ptr duplicate (
-        ::CORBA::ExtLocalInterfaceDef_ptr
+    static ::CORBA::AttributeDef_ptr duplicate (
+        ::CORBA::AttributeDef_ptr
       );
     static void release (
-        ::CORBA::ExtLocalInterfaceDef_ptr
+        ::CORBA::AttributeDef_ptr
       );
-    static ::CORBA::ExtLocalInterfaceDef_ptr nil (void);
+    static ::CORBA::AttributeDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::ExtLocalInterfaceDef_ptr p,
+        ::CORBA::AttributeDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_PRIMITIVEDEF__TRAITS_CH_)
-#define _CORBA_PRIMITIVEDEF__TRAITS_CH_
+#if !defined (_CORBA_EXTATTRIBUTEDEF__TRAITS_)
+#define _CORBA_EXTATTRIBUTEDEF__TRAITS_
   
   template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::PrimitiveDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExtAttributeDef>
   {
-    static ::CORBA::PrimitiveDef_ptr duplicate (
-        ::CORBA::PrimitiveDef_ptr
+    static ::CORBA::ExtAttributeDef_ptr duplicate (
+        ::CORBA::ExtAttributeDef_ptr
       );
     static void release (
-        ::CORBA::PrimitiveDef_ptr
+        ::CORBA::ExtAttributeDef_ptr
       );
-    static ::CORBA::PrimitiveDef_ptr nil (void);
+    static ::CORBA::ExtAttributeDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::PrimitiveDef_ptr p,
+        ::CORBA::ExtAttributeDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_STRINGDEF__TRAITS_CH_)
-#define _CORBA_STRINGDEF__TRAITS_CH_
+#if !defined (_CORBA_OPERATIONDEF__TRAITS_)
+#define _CORBA_OPERATIONDEF__TRAITS_
   
   template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::StringDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::OperationDef>
   {
-    static ::CORBA::StringDef_ptr duplicate (
-        ::CORBA::StringDef_ptr
+    static ::CORBA::OperationDef_ptr duplicate (
+        ::CORBA::OperationDef_ptr
       );
     static void release (
-        ::CORBA::StringDef_ptr
+        ::CORBA::OperationDef_ptr
       );
-    static ::CORBA::StringDef_ptr nil (void);
+    static ::CORBA::OperationDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::StringDef_ptr p,
+        ::CORBA::OperationDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_SEQUENCEDEF__TRAITS_CH_)
-#define _CORBA_SEQUENCEDEF__TRAITS_CH_
+#if !defined (_CORBA_INTERFACEDEF__TRAITS_)
+#define _CORBA_INTERFACEDEF__TRAITS_
   
   template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::SequenceDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::InterfaceDef>
   {
-    static ::CORBA::SequenceDef_ptr duplicate (
-        ::CORBA::SequenceDef_ptr
+    static ::CORBA::InterfaceDef_ptr duplicate (
+        ::CORBA::InterfaceDef_ptr
       );
     static void release (
-        ::CORBA::SequenceDef_ptr
+        ::CORBA::InterfaceDef_ptr
       );
-    static ::CORBA::SequenceDef_ptr nil (void);
+    static ::CORBA::InterfaceDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::SequenceDef_ptr p,
+        ::CORBA::InterfaceDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_ARRAYDEF__TRAITS_CH_)
-#define _CORBA_ARRAYDEF__TRAITS_CH_
+#if !defined (_CORBA_INTERFACEATTREXTENSION__TRAITS_)
+#define _CORBA_INTERFACEATTREXTENSION__TRAITS_
   
   template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ArrayDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::InterfaceAttrExtension>
   {
-    static ::CORBA::ArrayDef_ptr duplicate (
-        ::CORBA::ArrayDef_ptr
+    static ::CORBA::InterfaceAttrExtension_ptr duplicate (
+        ::CORBA::InterfaceAttrExtension_ptr
       );
     static void release (
-        ::CORBA::ArrayDef_ptr
+        ::CORBA::InterfaceAttrExtension_ptr
       );
-    static ::CORBA::ArrayDef_ptr nil (void);
+    static ::CORBA::InterfaceAttrExtension_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::ArrayDef_ptr p,
+        ::CORBA::InterfaceAttrExtension_ptr p,
         TAO_OutputCDR & cdr
       );
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_WSTRINGDEF__TRAITS_CH_)
-#define _CORBA_WSTRINGDEF__TRAITS_CH_
+#if !defined (_CORBA_EXTINTERFACEDEF__TRAITS_)
+#define _CORBA_EXTINTERFACEDEF__TRAITS_
   
   template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::WstringDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExtInterfaceDef>
   {
-    static ::CORBA::WstringDef_ptr duplicate (
-        ::CORBA::WstringDef_ptr
+    static ::CORBA::ExtInterfaceDef_ptr duplicate (
+        ::CORBA::ExtInterfaceDef_ptr
       );
     static void release (
-        ::CORBA::WstringDef_ptr
+        ::CORBA::ExtInterfaceDef_ptr
       );
-    static ::CORBA::WstringDef_ptr nil (void);
+    static ::CORBA::ExtInterfaceDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::WstringDef_ptr p,
+        ::CORBA::ExtInterfaceDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_ATTRIBUTEDEF__TRAITS_CH_)
-#define _CORBA_ATTRIBUTEDEF__TRAITS_CH_
+#if !defined (_CORBA_ABSTRACTINTERFACEDEF__TRAITS_)
+#define _CORBA_ABSTRACTINTERFACEDEF__TRAITS_
   
   template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::AttributeDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::AbstractInterfaceDef>
   {
-    static ::CORBA::AttributeDef_ptr duplicate (
-        ::CORBA::AttributeDef_ptr
+    static ::CORBA::AbstractInterfaceDef_ptr duplicate (
+        ::CORBA::AbstractInterfaceDef_ptr
       );
     static void release (
-        ::CORBA::AttributeDef_ptr
+        ::CORBA::AbstractInterfaceDef_ptr
       );
-    static ::CORBA::AttributeDef_ptr nil (void);
+    static ::CORBA::AbstractInterfaceDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::AttributeDef_ptr p,
+        ::CORBA::AbstractInterfaceDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_EXTATTRIBUTEDEF__TRAITS_CH_)
-#define _CORBA_EXTATTRIBUTEDEF__TRAITS_CH_
+#if !defined (_CORBA_EXTABSTRACTINTERFACEDEF__TRAITS_)
+#define _CORBA_EXTABSTRACTINTERFACEDEF__TRAITS_
   
   template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExtAttributeDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExtAbstractInterfaceDef>
   {
-    static ::CORBA::ExtAttributeDef_ptr duplicate (
-        ::CORBA::ExtAttributeDef_ptr
+    static ::CORBA::ExtAbstractInterfaceDef_ptr duplicate (
+        ::CORBA::ExtAbstractInterfaceDef_ptr
       );
     static void release (
-        ::CORBA::ExtAttributeDef_ptr
+        ::CORBA::ExtAbstractInterfaceDef_ptr
       );
-    static ::CORBA::ExtAttributeDef_ptr nil (void);
+    static ::CORBA::ExtAbstractInterfaceDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::ExtAttributeDef_ptr p,
+        ::CORBA::ExtAbstractInterfaceDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_OPERATIONDEF__TRAITS_CH_)
-#define _CORBA_OPERATIONDEF__TRAITS_CH_
+#if !defined (_CORBA_LOCALINTERFACEDEF__TRAITS_)
+#define _CORBA_LOCALINTERFACEDEF__TRAITS_
   
   template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::OperationDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::LocalInterfaceDef>
   {
-    static ::CORBA::OperationDef_ptr duplicate (
-        ::CORBA::OperationDef_ptr
+    static ::CORBA::LocalInterfaceDef_ptr duplicate (
+        ::CORBA::LocalInterfaceDef_ptr
       );
     static void release (
-        ::CORBA::OperationDef_ptr
+        ::CORBA::LocalInterfaceDef_ptr
       );
-    static ::CORBA::OperationDef_ptr nil (void);
+    static ::CORBA::LocalInterfaceDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::OperationDef_ptr p,
+        ::CORBA::LocalInterfaceDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_INTERFACEATTREXTENSION__TRAITS_CH_)
-#define _CORBA_INTERFACEATTREXTENSION__TRAITS_CH_
+#if !defined (_CORBA_EXTLOCALINTERFACEDEF__TRAITS_)
+#define _CORBA_EXTLOCALINTERFACEDEF__TRAITS_
   
   template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::InterfaceAttrExtension>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExtLocalInterfaceDef>
   {
-    static ::CORBA::InterfaceAttrExtension_ptr duplicate (
-        ::CORBA::InterfaceAttrExtension_ptr
+    static ::CORBA::ExtLocalInterfaceDef_ptr duplicate (
+        ::CORBA::ExtLocalInterfaceDef_ptr
       );
     static void release (
-        ::CORBA::InterfaceAttrExtension_ptr
+        ::CORBA::ExtLocalInterfaceDef_ptr
       );
-    static ::CORBA::InterfaceAttrExtension_ptr nil (void);
+    static ::CORBA::ExtLocalInterfaceDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::InterfaceAttrExtension_ptr p,
+        ::CORBA::ExtLocalInterfaceDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -5007,27 +5029,27 @@ TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::FixedDef_ptr *); //
 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
+// be\be_visitor_enum/any_op_ch.cpp:52
 
 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
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 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
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 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
+// be\be_visitor_structure/any_op_ch.cpp:53
 
 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
@@ -5035,14 +5057,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
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 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
+// be\be_visitor_structure/any_op_ch.cpp:53
 
 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
@@ -5050,84 +5072,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
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 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
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 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
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 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
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 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
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 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
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 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
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 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
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 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
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 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
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 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
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 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_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 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
@@ -5135,20 +5157,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_enum/any_op_ch.cpp:51
+// be\be_visitor_enum/any_op_ch.cpp:52
 
 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
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 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
+// be\be_visitor_structure/any_op_ch.cpp:53
 
 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
@@ -5156,7 +5178,7 @@ 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_structure/any_op_ch.cpp:52
+// be\be_visitor_structure/any_op_ch.cpp:53
 
 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
@@ -5164,20 +5186,20 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Ext
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ExtAttributeDescription *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 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
-// be\be_visitor_enum/any_op_ch.cpp:51
+// be\be_visitor_enum/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_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
+// be\be_visitor_structure/any_op_ch.cpp:53
 
 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
@@ -5185,7 +5207,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
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 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
@@ -5193,7 +5215,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
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 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
@@ -5201,14 +5223,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
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 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
+// be\be_visitor_structure/any_op_ch.cpp:53
 
 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
@@ -5216,7 +5238,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
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 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
@@ -5224,7 +5246,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
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 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
@@ -5232,7 +5254,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
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 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
@@ -5240,7 +5262,7 @@ 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_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 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
@@ -5248,14 +5270,14 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Ext
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ExtAttrDescriptionSeq *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 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
+// be\be_visitor_structure/any_op_ch.cpp:53
 
 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
@@ -5263,7 +5285,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
+// be\be_visitor_structure/any_op_ch.cpp:53
 
 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
@@ -5271,14 +5293,14 @@ 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
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 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
-// be\be_visitor_structure/any_op_ch.cpp:52
+// be\be_visitor_structure/any_op_ch.cpp:53
 
 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
@@ -5286,35 +5308,35 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Int
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 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
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 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
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 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
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 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_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 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
@@ -5663,7 +5685,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::E
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ExtLocalInterfaceDef_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
+// be\be_codegen.cpp:1136
 
 #if defined (__ACE_INLINE__)
 #include "IFR_BasicC.inl"
diff --git a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
index 9c80b614a85..ae931277f9a 100644
--- a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
+++ b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
@@ -7,8 +7,8 @@
 #include "tao/ORB.h"
 #include "tao/Invocation_Adapter.h"
 #include "tao/Stub.h"
-#include "tao/NVList.h"
-#include "tao/Any_Unknown_IDL_Type.h"
+#include "tao/AnyTypeCode/NVList.h"
+#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 
 ACE_RCSID (IFR_Client,
            IFR_Client_Adapter_Impl,
@@ -23,7 +23,8 @@ namespace TAO
             CORBA::InterfaceDef_ptr,
             CORBA::InterfaceDef_var,
             CORBA::InterfaceDef_out,
-            TAO::Objref_Traits<CORBA::InterfaceDef>
+            TAO::Objref_Traits<CORBA::InterfaceDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::InterfaceDef_ptr>
           >
   {
   };
@@ -44,11 +45,11 @@ TAO_IFR_Client_Adapter_Impl::interfacedef_cdr_insert (
 
 void
 TAO_IFR_Client_Adapter_Impl::interfacedef_any_insert (
-    CORBA::Any &any,
+    CORBA::Any *any,
     CORBA::InterfaceDef_ptr object_type
   )
 {
-  any <<= object_type;
+  (*any) <<= object_type;
 }
 
 void
diff --git a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h
index c6a2435b280..bab2b9d2cb8 100644
--- a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h
+++ b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h
@@ -47,7 +47,7 @@ public:
     );
 
   virtual void interfacedef_any_insert (
-      CORBA::Any &any,
+      CORBA::Any *any,
       CORBA::InterfaceDef_ptr object_type
     );
 
diff --git a/TAO/tao/IFR_Client/IFR_Components.pidl b/TAO/tao/IFR_Client/IFR_Components.pidl
index 2431d9b5fe5..6bae6d0ebb0 100644
--- a/TAO/tao/IFR_Client/IFR_Components.pidl
+++ b/TAO/tao/IFR_Client/IFR_Components.pidl
@@ -1,55 +1,50 @@
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO_IFR_Client
-//
-// = FILENAME
-//   IFR_Components.pidl
-//
-// = DESCRIPTION
-//   This file was used to generate the code in IFR_ComponentsC.{h,i,cpp}.
-//   The original file Interface.idl was split into four pieces, to
-//   keep the generated files to a manageable size and reduce build
-//   time. This IDL file contains all the interfaces and other data
-//   types related to CORBA components.
-//
-//   The command used to generate code from this IDL file is:
-//
-//     tao_idl -Ge 1 -Sc -GA -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
-//
-//   Only the stub files are used in the TAO_IFR_Client library. The
-//   skeleton files can be deleted from this directory.
-//
-//   No patching of the generated stub files is necessary.
-//
-//   To generate the skeleton files for the IFR Service, the command is:
-//
-//     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 skeleton 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.
-//
-// ================================================================
+// -*- IDL -*-
+
+/**
+ * @file IFR_Components.pidl
+ *
+ * $Id$
+ *
+ *   This file was used to generate the code in IFR_ComponentsC.{h,inl,cpp}.
+ *   The original file Interface.idl was split into four pieces, to
+ *   keep the generated files to a manageable size and reduce build
+ *   time. This IDL file contains all the interfaces and other data
+ *   types related to CORBA components.
+ *
+ *   The command used to generate code from this IDL file is:
+ *
+ *     tao_idl -Ge 1 -Sc -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
+ *
+ *   Only the stub files are used in the TAO_IFR_Client library. The
+ *   skeleton files can be deleted from this directory.
+ *
+ *   No patching of the generated stub files is necessary.
+ *
+ *   To generate the skeleton files for the IFR Service, the command is:
+ *
+ *     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 skeleton 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_
 #define _IFR_COMPONENTS_IDL_
diff --git a/TAO/tao/IFR_Client/IFR_ComponentsA.cpp b/TAO/tao/IFR_Client/IFR_ComponentsA.cpp
deleted file mode 100644
index 158fdd88a07..00000000000
--- a/TAO/tao/IFR_Client/IFR_ComponentsA.cpp
+++ /dev/null
@@ -1,1954 +0,0 @@
-// -*- 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/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "IFR_ComponentsC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_EventDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ComponentIR/EventDef:1.0",
-    "EventDef");
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_EventDef =
-      &_tao_tc_CORBA_ComponentIR_EventDef;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_Container (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ComponentIR/Container:1.0",
-    "Container");
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_Container =
-      &_tao_tc_CORBA_ComponentIR_Container;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_ModuleDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ComponentIR/ModuleDef:1.0",
-    "ModuleDef");
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_ModuleDef =
-      &_tao_tc_CORBA_ComponentIR_ModuleDef;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_Repository (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ComponentIR/Repository:1.0",
-    "Repository");
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_Repository =
-      &_tao_tc_CORBA_ComponentIR_Repository;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_ProvidesDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ComponentIR/ProvidesDef:1.0",
-    "ProvidesDef");
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_ProvidesDef =
-      &_tao_tc_CORBA_ComponentIR_ProvidesDef;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ComponentIR_ProvidesDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec },
-    { "interface_type", &CORBA::_tc_RepositoryId }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_ProvidesDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/ComponentIR/ProvidesDescription:1.0",
-    "ProvidesDescription",
-    _tao_fields_CORBA_ComponentIR_ProvidesDescription,
-    5);
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_ProvidesDescription =
-      &_tao_tc_CORBA_ComponentIR_ProvidesDescription;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_UsesDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ComponentIR/UsesDef:1.0",
-    "UsesDef");
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_UsesDef =
-      &_tao_tc_CORBA_ComponentIR_UsesDef;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ComponentIR_UsesDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec },
-    { "interface_type", &CORBA::_tc_RepositoryId },
-    { "is_multiple", &CORBA::_tc_boolean }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_UsesDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/ComponentIR/UsesDescription:1.0",
-    "UsesDescription",
-    _tao_fields_CORBA_ComponentIR_UsesDescription,
-    6);
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_UsesDescription =
-      &_tao_tc_CORBA_ComponentIR_UsesDescription;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_EventPortDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ComponentIR/EventPortDef:1.0",
-    "EventPortDef");
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_EventPortDef =
-      &_tao_tc_CORBA_ComponentIR_EventPortDef;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ComponentIR_EventPortDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec },
-    { "event", &CORBA::_tc_RepositoryId }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_EventPortDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/ComponentIR/EventPortDescription:1.0",
-    "EventPortDescription",
-    _tao_fields_CORBA_ComponentIR_EventPortDescription,
-    5);
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_EventPortDescription =
-      &_tao_tc_CORBA_ComponentIR_EventPortDescription;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_EmitsDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ComponentIR/EmitsDef:1.0",
-    "EmitsDef");
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_EmitsDef =
-      &_tao_tc_CORBA_ComponentIR_EmitsDef;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_PublishesDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ComponentIR/PublishesDef:1.0",
-    "PublishesDef");
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_PublishesDef =
-      &_tao_tc_CORBA_ComponentIR_PublishesDef;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_ConsumesDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ComponentIR/ConsumesDef:1.0",
-    "ConsumesDef");
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_ConsumesDef =
-      &_tao_tc_CORBA_ComponentIR_ConsumesDef;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_ComponentDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ComponentIR/ComponentDef:1.0",
-    "ComponentDef");
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_ComponentDef =
-      &_tao_tc_CORBA_ComponentIR_ComponentDef;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_ComponentIR_ProvidesDescriptionSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ComponentIR_ProvidesDescriptionSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ComponentIR_ProvidesDescriptionSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::ComponentIR::_tc_ProvidesDescription,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ComponentIR_ProvidesDescriptionSeq_0 =
-      &CORBA_ComponentIR_ProvidesDescriptionSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ComponentIR_ProvidesDescriptionSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_ProvidesDescriptionSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ComponentIR/ProvidesDescriptionSeq:1.0",
-    "ProvidesDescriptionSeq",
-    &TAO::TypeCode::tc_CORBA_ComponentIR_ProvidesDescriptionSeq_0);
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_ProvidesDescriptionSeq =
-      &_tao_tc_CORBA_ComponentIR_ProvidesDescriptionSeq;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_ComponentIR_UsesDescriptionSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ComponentIR_UsesDescriptionSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ComponentIR_UsesDescriptionSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::ComponentIR::_tc_UsesDescription,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ComponentIR_UsesDescriptionSeq_0 =
-      &CORBA_ComponentIR_UsesDescriptionSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ComponentIR_UsesDescriptionSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_UsesDescriptionSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ComponentIR/UsesDescriptionSeq:1.0",
-    "UsesDescriptionSeq",
-    &TAO::TypeCode::tc_CORBA_ComponentIR_UsesDescriptionSeq_0);
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_UsesDescriptionSeq =
-      &_tao_tc_CORBA_ComponentIR_UsesDescriptionSeq;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_ComponentIR_EventPortDescriptionSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ComponentIR_EventPortDescriptionSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ComponentIR_EventPortDescriptionSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::ComponentIR::_tc_EventPortDescription,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ComponentIR_EventPortDescriptionSeq_0 =
-      &CORBA_ComponentIR_EventPortDescriptionSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ComponentIR_EventPortDescriptionSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_EventPortDescriptionSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ComponentIR/EventPortDescriptionSeq:1.0",
-    "EventPortDescriptionSeq",
-    &TAO::TypeCode::tc_CORBA_ComponentIR_EventPortDescriptionSeq_0);
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_EventPortDescriptionSeq =
-      &_tao_tc_CORBA_ComponentIR_EventPortDescriptionSeq;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ComponentIR_ComponentDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec },
-    { "base_component", &CORBA::_tc_RepositoryId },
-    { "supported_interfaces", &CORBA::_tc_RepositoryIdSeq },
-    { "provided_interfaces", &CORBA::ComponentIR::_tc_ProvidesDescriptionSeq },
-    { "used_interfaces", &CORBA::ComponentIR::_tc_UsesDescriptionSeq },
-    { "emits_events", &CORBA::ComponentIR::_tc_EventPortDescriptionSeq },
-    { "publishes_events", &CORBA::ComponentIR::_tc_EventPortDescriptionSeq },
-    { "consumes_events", &CORBA::ComponentIR::_tc_EventPortDescriptionSeq },
-    { "attributes", &CORBA::_tc_ExtAttrDescriptionSeq },
-    { "type", &CORBA::_tc_TypeCode }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_ComponentDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/ComponentIR/ComponentDescription:1.0",
-    "ComponentDescription",
-    _tao_fields_CORBA_ComponentIR_ComponentDescription,
-    13);
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_ComponentDescription =
-      &_tao_tc_CORBA_ComponentIR_ComponentDescription;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_FactoryDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ComponentIR/FactoryDef:1.0",
-    "FactoryDef");
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_FactoryDef =
-      &_tao_tc_CORBA_ComponentIR_FactoryDef;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_FinderDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ComponentIR/FinderDef:1.0",
-    "FinderDef");
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_FinderDef =
-      &_tao_tc_CORBA_ComponentIR_FinderDef;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_HomeDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ComponentIR/HomeDef:1.0",
-    "HomeDef");
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_HomeDef =
-      &_tao_tc_CORBA_ComponentIR_HomeDef;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ComponentIR_HomeDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec },
-    { "base_home", &CORBA::_tc_RepositoryId },
-    { "managed_component", &CORBA::_tc_RepositoryId },
-    { "primary_key", &CORBA::_tc_ValueDescription },
-    { "factories", &CORBA::_tc_OpDescriptionSeq },
-    { "finders", &CORBA::_tc_OpDescriptionSeq },
-    { "operations", &CORBA::_tc_OpDescriptionSeq },
-    { "attributes", &CORBA::_tc_ExtAttrDescriptionSeq },
-    { "type", &CORBA::_tc_TypeCode }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_HomeDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/ComponentIR/HomeDescription:1.0",
-    "HomeDescription",
-    _tao_fields_CORBA_ComponentIR_HomeDescription,
-    12);
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_HomeDescription =
-      &_tao_tc_CORBA_ComponentIR_HomeDescription;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ComponentIR::EventDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::EventDef_ptr _tao_elem
-  )
-{
-  CORBA::ComponentIR::EventDef_ptr _tao_objptr =
-    CORBA::ComponentIR::EventDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::EventDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ComponentIR::EventDef>::insert (
-      _tao_any,
-      CORBA::ComponentIR::EventDef::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_EventDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ComponentIR::EventDef_ptr &_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
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ComponentIR::Container>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::Container_ptr _tao_elem
-  )
-{
-  CORBA::ComponentIR::Container_ptr _tao_objptr =
-    CORBA::ComponentIR::Container::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::Container_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ComponentIR::Container>::insert (
-      _tao_any,
-      CORBA::ComponentIR::Container::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_Container,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ComponentIR::Container_ptr &_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
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ComponentIR::ModuleDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::ModuleDef_ptr _tao_elem
-  )
-{
-  CORBA::ComponentIR::ModuleDef_ptr _tao_objptr =
-    CORBA::ComponentIR::ModuleDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::ModuleDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ComponentIR::ModuleDef>::insert (
-      _tao_any,
-      CORBA::ComponentIR::ModuleDef::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_ModuleDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ComponentIR::ModuleDef_ptr &_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
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ComponentIR::Repository>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::Repository_ptr _tao_elem
-  )
-{
-  CORBA::ComponentIR::Repository_ptr _tao_objptr =
-    CORBA::ComponentIR::Repository::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::Repository_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ComponentIR::Repository>::insert (
-      _tao_any,
-      CORBA::ComponentIR::Repository::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_Repository,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ComponentIR::Repository_ptr &_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
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ComponentIR::ProvidesDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::ProvidesDef_ptr _tao_elem
-  )
-{
-  CORBA::ComponentIR::ProvidesDef_ptr _tao_objptr =
-    CORBA::ComponentIR::ProvidesDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::ProvidesDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ComponentIR::ProvidesDef>::insert (
-      _tao_any,
-      CORBA::ComponentIR::ProvidesDef::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_ProvidesDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ComponentIR::ProvidesDef_ptr &_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
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ComponentIR::ProvidesDescription &_tao_elem
-  )
-{
-  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,
-    CORBA::ComponentIR::ProvidesDescription *_tao_elem
-  )
-{
-  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,
-    CORBA::ComponentIR::ProvidesDescription *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ComponentIR::ProvidesDescription *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ComponentIR::ProvidesDescription *&_tao_elem
-  )
-{
-  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_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ComponentIR::UsesDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::UsesDef_ptr _tao_elem
-  )
-{
-  CORBA::ComponentIR::UsesDef_ptr _tao_objptr =
-    CORBA::ComponentIR::UsesDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::UsesDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ComponentIR::UsesDef>::insert (
-      _tao_any,
-      CORBA::ComponentIR::UsesDef::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_UsesDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ComponentIR::UsesDef_ptr &_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
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ComponentIR::UsesDescription &_tao_elem
-  )
-{
-  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,
-    CORBA::ComponentIR::UsesDescription *_tao_elem
-  )
-{
-  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,
-    CORBA::ComponentIR::UsesDescription *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ComponentIR::UsesDescription *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ComponentIR::UsesDescription *&_tao_elem
-  )
-{
-  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_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ComponentIR::EventPortDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::EventPortDef_ptr _tao_elem
-  )
-{
-  CORBA::ComponentIR::EventPortDef_ptr _tao_objptr =
-    CORBA::ComponentIR::EventPortDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::EventPortDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ComponentIR::EventPortDef>::insert (
-      _tao_any,
-      CORBA::ComponentIR::EventPortDef::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_EventPortDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ComponentIR::EventPortDef_ptr &_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
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ComponentIR::EventPortDescription &_tao_elem
-  )
-{
-  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,
-    CORBA::ComponentIR::EventPortDescription *_tao_elem
-  )
-{
-  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,
-    CORBA::ComponentIR::EventPortDescription *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ComponentIR::EventPortDescription *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ComponentIR::EventPortDescription *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ComponentIR::EventPortDescription>::extract (
-        _tao_any,
-        CORBA::ComponentIR::EventPortDescription::_tao_any_destructor,
-        CORBA::ComponentIR::_tc_EventPortDescription,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ComponentIR::EmitsDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::EmitsDef_ptr _tao_elem
-  )
-{
-  CORBA::ComponentIR::EmitsDef_ptr _tao_objptr =
-    CORBA::ComponentIR::EmitsDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::EmitsDef_ptr *_tao_elem
-  )
-{
-  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,
-    CORBA::ComponentIR::EmitsDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ComponentIR::EmitsDef>::extract (
-        _tao_any,
-        CORBA::ComponentIR::EmitsDef::_tao_any_destructor,
-        CORBA::ComponentIR::_tc_EmitsDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ComponentIR::PublishesDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::PublishesDef_ptr _tao_elem
-  )
-{
-  CORBA::ComponentIR::PublishesDef_ptr _tao_objptr =
-    CORBA::ComponentIR::PublishesDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::PublishesDef_ptr *_tao_elem
-  )
-{
-  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,
-    CORBA::ComponentIR::PublishesDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ComponentIR::PublishesDef>::extract (
-        _tao_any,
-        CORBA::ComponentIR::PublishesDef::_tao_any_destructor,
-        CORBA::ComponentIR::_tc_PublishesDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ComponentIR::ConsumesDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::ConsumesDef_ptr _tao_elem
-  )
-{
-  CORBA::ComponentIR::ConsumesDef_ptr _tao_objptr =
-    CORBA::ComponentIR::ConsumesDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::ConsumesDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ComponentIR::ConsumesDef>::insert (
-      _tao_any,
-      CORBA::ComponentIR::ConsumesDef::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_ConsumesDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ComponentIR::ConsumesDef_ptr &_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
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ComponentIR::ComponentDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::ComponentDef_ptr _tao_elem
-  )
-{
-  CORBA::ComponentIR::ComponentDef_ptr _tao_objptr =
-    CORBA::ComponentIR::ComponentDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::ComponentDef_ptr *_tao_elem
-  )
-{
-  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,
-    CORBA::ComponentIR::ComponentDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ComponentIR::ComponentDef>::extract (
-        _tao_any,
-        CORBA::ComponentIR::ComponentDef::_tao_any_destructor,
-        CORBA::ComponentIR::_tc_ComponentDef,
-        _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::ComponentIR::ProvidesDescriptionSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::ProvidesDescriptionSeq>::insert_copy (
-      _tao_any,
-      CORBA::ComponentIR::ProvidesDescriptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ComponentIR_ProvidesDescriptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::ProvidesDescriptionSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::ProvidesDescriptionSeq>::insert (
-      _tao_any,
-      CORBA::ComponentIR::ProvidesDescriptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ComponentIR_ProvidesDescriptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ComponentIR::ProvidesDescriptionSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ComponentIR::ProvidesDescriptionSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ComponentIR::ProvidesDescriptionSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ComponentIR::ProvidesDescriptionSeq>::extract (
-        _tao_any,
-        CORBA::ComponentIR::ProvidesDescriptionSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ComponentIR_ProvidesDescriptionSeq_0,
-        _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::ComponentIR::UsesDescriptionSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::UsesDescriptionSeq>::insert_copy (
-      _tao_any,
-      CORBA::ComponentIR::UsesDescriptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ComponentIR_UsesDescriptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::UsesDescriptionSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::UsesDescriptionSeq>::insert (
-      _tao_any,
-      CORBA::ComponentIR::UsesDescriptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ComponentIR_UsesDescriptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ComponentIR::UsesDescriptionSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ComponentIR::UsesDescriptionSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ComponentIR::UsesDescriptionSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ComponentIR::UsesDescriptionSeq>::extract (
-        _tao_any,
-        CORBA::ComponentIR::UsesDescriptionSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ComponentIR_UsesDescriptionSeq_0,
-        _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::ComponentIR::EventPortDescriptionSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::EventPortDescriptionSeq>::insert_copy (
-      _tao_any,
-      CORBA::ComponentIR::EventPortDescriptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ComponentIR_EventPortDescriptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::EventPortDescriptionSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::EventPortDescriptionSeq>::insert (
-      _tao_any,
-      CORBA::ComponentIR::EventPortDescriptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ComponentIR_EventPortDescriptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ComponentIR::EventPortDescriptionSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ComponentIR::EventPortDescriptionSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ComponentIR::EventPortDescriptionSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ComponentIR::EventPortDescriptionSeq>::extract (
-        _tao_any,
-        CORBA::ComponentIR::EventPortDescriptionSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ComponentIR_EventPortDescriptionSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ComponentIR::ComponentDescription &_tao_elem
-  )
-{
-  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,
-    CORBA::ComponentIR::ComponentDescription *_tao_elem
-  )
-{
-  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,
-    CORBA::ComponentIR::ComponentDescription *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ComponentIR::ComponentDescription *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ComponentIR::ComponentDescription *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ComponentIR::ComponentDescription>::extract (
-        _tao_any,
-        CORBA::ComponentIR::ComponentDescription::_tao_any_destructor,
-        CORBA::ComponentIR::_tc_ComponentDescription,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ComponentIR::FactoryDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::FactoryDef_ptr _tao_elem
-  )
-{
-  CORBA::ComponentIR::FactoryDef_ptr _tao_objptr =
-    CORBA::ComponentIR::FactoryDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::FactoryDef_ptr *_tao_elem
-  )
-{
-  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,
-    CORBA::ComponentIR::FactoryDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ComponentIR::FactoryDef>::extract (
-        _tao_any,
-        CORBA::ComponentIR::FactoryDef::_tao_any_destructor,
-        CORBA::ComponentIR::_tc_FactoryDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ComponentIR::FinderDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::FinderDef_ptr _tao_elem
-  )
-{
-  CORBA::ComponentIR::FinderDef_ptr _tao_objptr =
-    CORBA::ComponentIR::FinderDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::FinderDef_ptr *_tao_elem
-  )
-{
-  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,
-    CORBA::ComponentIR::FinderDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ComponentIR::FinderDef>::extract (
-        _tao_any,
-        CORBA::ComponentIR::FinderDef::_tao_any_destructor,
-        CORBA::ComponentIR::_tc_FinderDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ComponentIR::HomeDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::HomeDef_ptr _tao_elem
-  )
-{
-  CORBA::ComponentIR::HomeDef_ptr _tao_objptr =
-    CORBA::ComponentIR::HomeDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::HomeDef_ptr *_tao_elem
-  )
-{
-  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,
-    CORBA::ComponentIR::HomeDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ComponentIR::HomeDef>::extract (
-        _tao_any,
-        CORBA::ComponentIR::HomeDef::_tao_any_destructor,
-        CORBA::ComponentIR::_tc_HomeDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ComponentIR::HomeDescription &_tao_elem
-  )
-{
-  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,
-    CORBA::ComponentIR::HomeDescription *_tao_elem
-  )
-{
-  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,
-    CORBA::ComponentIR::HomeDescription *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ComponentIR::HomeDescription *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ComponentIR::HomeDescription *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ComponentIR::HomeDescription>::extract (
-        _tao_any,
-        CORBA::ComponentIR::HomeDescription::_tao_any_destructor,
-        CORBA::ComponentIR::_tc_HomeDescription,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/IFR_Client/IFR_ComponentsA.h b/TAO/tao/IFR_Client/IFR_ComponentsA.h
new file mode 100644
index 00000000000..85f87f8d00d
--- /dev/null
+++ b/TAO/tao/IFR_Client/IFR_ComponentsA.h
@@ -0,0 +1,44 @@
+// -*- 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/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:390
+
+#ifndef _TAO_IDL_ORIG_IFR_COMPONENTS_A_H
+#define _TAO_IDL_ORIG_IFR_COMPONENTS_A_H
+
+#include /**/ "ace/pre.h"
+
+#include "tao/IFR_Client/IFR_ComponentsC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "ace/post.h"
+#endif /* ifndef */
+
diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.cpp b/TAO/tao/IFR_Client/IFR_ComponentsC.cpp
index f59eb0ee30b..06058bc2fed 100644
--- a/TAO/tao/IFR_Client/IFR_ComponentsC.cpp
+++ b/TAO/tao/IFR_Client/IFR_ComponentsC.cpp
@@ -26,14 +26,26 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:293
 
 
 #include "IFR_ComponentsC.h"
 #include "tao/CDR.h"
-#include "tao/Exception_Data.h"
+#include "tao/IFR_Client/IFR_ExtendedC.h"
+#include "tao/AnyTypeCode/orb_typesA.h"
 #include "tao/Invocation_Adapter.h"
 #include "tao/Object_T.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Sequence_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
+#include "tao/AnyTypeCode/Recursive_Type_TypeCode.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 #include "tao/Basic_Arguments.h"
 #include "tao/Object_Argument_T.h"
 #include "tao/Special_Basic_Arguments.h"
@@ -50,15 +62,18 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
 {
 
-#if !defined (_CORBA_INTERFACEDEF__ARG_TRAITS_CS_)
-#define _CORBA_INTERFACEDEF__ARG_TRAITS_CS_
-  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
+
+#if !defined (_CORBA_INTERFACEDEF__ARG_TRAITS_)
+#define _CORBA_INTERFACEDEF__ARG_TRAITS_
+
   template<>
   class  Arg_Traits<CORBA::InterfaceDef>
     : public
@@ -66,35 +81,40 @@ namespace TAO
             CORBA::InterfaceDef_ptr,
             CORBA::InterfaceDef_var,
             CORBA::InterfaceDef_out,
-            TAO::Objref_Traits<CORBA::InterfaceDef>
+            TAO::Objref_Traits<CORBA::InterfaceDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::InterfaceDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
+
+#if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_)
+#define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_
 
-#if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_CS_)
-#define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_CS_
-  
   template<>
   class Arg_Traits<CORBA::InterfaceDefSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::InterfaceDefSeq,
             CORBA::InterfaceDefSeq_var,
-            CORBA::InterfaceDefSeq_out
+            CORBA::InterfaceDefSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::InterfaceDefSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_VALUEDEF__ARG_TRAITS_CS_)
-#define _CORBA_VALUEDEF__ARG_TRAITS_CS_
-  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
+
+#if !defined (_CORBA_VALUEDEF__ARG_TRAITS_)
+#define _CORBA_VALUEDEF__ARG_TRAITS_
+
   template<>
   class  Arg_Traits<CORBA::ValueDef>
     : public
@@ -102,91 +122,99 @@ namespace TAO
             CORBA::ValueDef_ptr,
             CORBA::ValueDef_var,
             CORBA::ValueDef_out,
-            TAO::Objref_Traits<CORBA::ValueDef>
+            TAO::Objref_Traits<CORBA::ValueDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ValueDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
+
+#if !defined (_CORBA_VALUEDEFSEQ__ARG_TRAITS_)
+#define _CORBA_VALUEDEFSEQ__ARG_TRAITS_
 
-#if !defined (_CORBA_VALUEDEFSEQ__ARG_TRAITS_CS_)
-#define _CORBA_VALUEDEFSEQ__ARG_TRAITS_CS_
-  
   template<>
   class Arg_Traits<CORBA::ValueDefSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ValueDefSeq,
             CORBA::ValueDefSeq_var,
-            CORBA::ValueDefSeq_out
+            CORBA::ValueDefSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ValueDefSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
+
+#if !defined (_CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_)
+#define _CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_
 
-#if !defined (_CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_CS_)
-#define _CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_CS_
-  
   template<>
   class Arg_Traits<CORBA::ExtInitializerSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ExtInitializerSeq,
             CORBA::ExtInitializerSeq_var,
-            CORBA::ExtInitializerSeq_out
+            CORBA::ExtInitializerSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ExtInitializerSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
+
+#if !defined (_CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_)
+#define _CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_
 
-#if !defined (_CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_CS_)
-#define _CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_CS_
-  
   template<>
   class Arg_Traits<CORBA::ExceptionDefSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ExceptionDefSeq,
             CORBA::ExceptionDefSeq_var,
-            CORBA::ExceptionDefSeq_out
+            CORBA::ExceptionDefSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ExceptionDefSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
+
+#if !defined (_CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_)
+#define _CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_
 
-#if !defined (_CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_CS_)
-#define _CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_CS_
-  
   template<>
   class Arg_Traits<CORBA::ParDescriptionSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ParDescriptionSeq,
             CORBA::ParDescriptionSeq_var,
-            CORBA::ParDescriptionSeq_out
+            CORBA::ParDescriptionSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ParDescriptionSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_COMPONENTIR_COMPONENTDEF__ARG_TRAITS_CS_)
-#define _CORBA_COMPONENTIR_COMPONENTDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_COMPONENTIR_COMPONENTDEF__ARG_TRAITS_)
+#define _CORBA_COMPONENTIR_COMPONENTDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ComponentIR::ComponentDef>
@@ -195,15 +223,19 @@ namespace TAO
             CORBA::ComponentIR::ComponentDef_ptr,
             CORBA::ComponentIR::ComponentDef_var,
             CORBA::ComponentIR::ComponentDef_out,
-            TAO::Objref_Traits<CORBA::ComponentIR::ComponentDef>
+            TAO::Objref_Traits<CORBA::ComponentIR::ComponentDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ComponentIR::ComponentDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_COMPONENTIR_HOMEDEF__ARG_TRAITS_CS_)
-#define _CORBA_COMPONENTIR_HOMEDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_COMPONENTIR_HOMEDEF__ARG_TRAITS_)
+#define _CORBA_COMPONENTIR_HOMEDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ComponentIR::HomeDef>
@@ -212,15 +244,19 @@ namespace TAO
             CORBA::ComponentIR::HomeDef_ptr,
             CORBA::ComponentIR::HomeDef_var,
             CORBA::ComponentIR::HomeDef_out,
-            TAO::Objref_Traits<CORBA::ComponentIR::HomeDef>
+            TAO::Objref_Traits<CORBA::ComponentIR::HomeDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ComponentIR::HomeDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_COMPONENTIR_EVENTDEF__ARG_TRAITS_CS_)
-#define _CORBA_COMPONENTIR_EVENTDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_COMPONENTIR_EVENTDEF__ARG_TRAITS_)
+#define _CORBA_COMPONENTIR_EVENTDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ComponentIR::EventDef>
@@ -229,15 +265,19 @@ namespace TAO
             CORBA::ComponentIR::EventDef_ptr,
             CORBA::ComponentIR::EventDef_var,
             CORBA::ComponentIR::EventDef_out,
-            TAO::Objref_Traits<CORBA::ComponentIR::EventDef>
+            TAO::Objref_Traits<CORBA::ComponentIR::EventDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ComponentIR::EventDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_COMPONENTIR_PROVIDESDEF__ARG_TRAITS_CS_)
-#define _CORBA_COMPONENTIR_PROVIDESDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_COMPONENTIR_PROVIDESDEF__ARG_TRAITS_)
+#define _CORBA_COMPONENTIR_PROVIDESDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ComponentIR::ProvidesDef>
@@ -246,15 +286,19 @@ namespace TAO
             CORBA::ComponentIR::ProvidesDef_ptr,
             CORBA::ComponentIR::ProvidesDef_var,
             CORBA::ComponentIR::ProvidesDef_out,
-            TAO::Objref_Traits<CORBA::ComponentIR::ProvidesDef>
+            TAO::Objref_Traits<CORBA::ComponentIR::ProvidesDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ComponentIR::ProvidesDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_COMPONENTIR_USESDEF__ARG_TRAITS_CS_)
-#define _CORBA_COMPONENTIR_USESDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_COMPONENTIR_USESDEF__ARG_TRAITS_)
+#define _CORBA_COMPONENTIR_USESDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ComponentIR::UsesDef>
@@ -263,15 +307,19 @@ namespace TAO
             CORBA::ComponentIR::UsesDef_ptr,
             CORBA::ComponentIR::UsesDef_var,
             CORBA::ComponentIR::UsesDef_out,
-            TAO::Objref_Traits<CORBA::ComponentIR::UsesDef>
+            TAO::Objref_Traits<CORBA::ComponentIR::UsesDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ComponentIR::UsesDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_COMPONENTIR_EMITSDEF__ARG_TRAITS_CS_)
-#define _CORBA_COMPONENTIR_EMITSDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_COMPONENTIR_EMITSDEF__ARG_TRAITS_)
+#define _CORBA_COMPONENTIR_EMITSDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ComponentIR::EmitsDef>
@@ -280,15 +328,19 @@ namespace TAO
             CORBA::ComponentIR::EmitsDef_ptr,
             CORBA::ComponentIR::EmitsDef_var,
             CORBA::ComponentIR::EmitsDef_out,
-            TAO::Objref_Traits<CORBA::ComponentIR::EmitsDef>
+            TAO::Objref_Traits<CORBA::ComponentIR::EmitsDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ComponentIR::EmitsDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_COMPONENTIR_PUBLISHESDEF__ARG_TRAITS_CS_)
-#define _CORBA_COMPONENTIR_PUBLISHESDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_COMPONENTIR_PUBLISHESDEF__ARG_TRAITS_)
+#define _CORBA_COMPONENTIR_PUBLISHESDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ComponentIR::PublishesDef>
@@ -297,15 +349,19 @@ namespace TAO
             CORBA::ComponentIR::PublishesDef_ptr,
             CORBA::ComponentIR::PublishesDef_var,
             CORBA::ComponentIR::PublishesDef_out,
-            TAO::Objref_Traits<CORBA::ComponentIR::PublishesDef>
+            TAO::Objref_Traits<CORBA::ComponentIR::PublishesDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ComponentIR::PublishesDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_COMPONENTIR_CONSUMESDEF__ARG_TRAITS_CS_)
-#define _CORBA_COMPONENTIR_CONSUMESDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_COMPONENTIR_CONSUMESDEF__ARG_TRAITS_)
+#define _CORBA_COMPONENTIR_CONSUMESDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ComponentIR::ConsumesDef>
@@ -314,15 +370,19 @@ namespace TAO
             CORBA::ComponentIR::ConsumesDef_ptr,
             CORBA::ComponentIR::ConsumesDef_var,
             CORBA::ComponentIR::ConsumesDef_out,
-            TAO::Objref_Traits<CORBA::ComponentIR::ConsumesDef>
+            TAO::Objref_Traits<CORBA::ComponentIR::ConsumesDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ComponentIR::ConsumesDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_COMPONENTIR_FACTORYDEF__ARG_TRAITS_CS_)
-#define _CORBA_COMPONENTIR_FACTORYDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_COMPONENTIR_FACTORYDEF__ARG_TRAITS_)
+#define _CORBA_COMPONENTIR_FACTORYDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ComponentIR::FactoryDef>
@@ -331,15 +391,19 @@ namespace TAO
             CORBA::ComponentIR::FactoryDef_ptr,
             CORBA::ComponentIR::FactoryDef_var,
             CORBA::ComponentIR::FactoryDef_out,
-            TAO::Objref_Traits<CORBA::ComponentIR::FactoryDef>
+            TAO::Objref_Traits<CORBA::ComponentIR::FactoryDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ComponentIR::FactoryDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_COMPONENTIR_FINDERDEF__ARG_TRAITS_CS_)
-#define _CORBA_COMPONENTIR_FINDERDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_COMPONENTIR_FINDERDEF__ARG_TRAITS_)
+#define _CORBA_COMPONENTIR_FINDERDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ComponentIR::FinderDef>
@@ -348,7 +412,8 @@ namespace TAO
             CORBA::ComponentIR::FinderDef_ptr,
             CORBA::ComponentIR::FinderDef_var,
             CORBA::ComponentIR::FinderDef_out,
-            TAO::Objref_Traits<CORBA::ComponentIR::FinderDef>
+            TAO::Objref_Traits<CORBA::ComponentIR::FinderDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ComponentIR::FinderDef_ptr>
           >
   {
   };
@@ -539,6 +604,27 @@ CORBA::ComponentIR::EventDef::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ComponentIR_EventDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/ComponentIR/EventDef:1.0",
+    "EventDef");
+  
+namespace CORBA
+{
+  namespace ComponentIR
+  {
+    ::CORBA::TypeCode_ptr const _tc_EventDef =
+      &_tao_tc_CORBA_ComponentIR_EventDef;
+  }
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::ComponentIR::Container.
@@ -605,12 +691,12 @@ TAO::Collocation_Proxy_Broker *
       CORBA_ComponentIR_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ComponentIR::ComponentDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_base_component (base_component);
-  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::in_arg_val _tao_supports_interfaces (supports_interfaces);
+  TAO::Arg_Traits< ::CORBA::ComponentIR::ComponentDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_base_component (base_component);
+  TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supports_interfaces (supports_interfaces);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -664,14 +750,14 @@ TAO::Collocation_Proxy_Broker *
       CORBA_ComponentIR_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ComponentIR::HomeDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::ComponentIR::HomeDef>::in_arg_val _tao_base_home (base_home);
-  TAO::Arg_Traits< CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_managed_component (managed_component);
-  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::in_arg_val _tao_supports_interfaces (supports_interfaces);
-  TAO::Arg_Traits< CORBA::ValueDef>::in_arg_val _tao_primary_key (primary_key);
+  TAO::Arg_Traits< ::CORBA::ComponentIR::HomeDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::ComponentIR::HomeDef>::in_arg_val _tao_base_home (base_home);
+  TAO::Arg_Traits< ::CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_managed_component (managed_component);
+  TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supports_interfaces (supports_interfaces);
+  TAO::Arg_Traits< ::CORBA::ValueDef>::in_arg_val _tao_primary_key (primary_key);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -730,17 +816,17 @@ TAO::Collocation_Proxy_Broker *
       CORBA_ComponentIR_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ComponentIR::EventDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::ComponentIR::EventDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_custom (is_custom);
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_abstract (is_abstract);
-  TAO::Arg_Traits< CORBA::ValueDef>::in_arg_val _tao_base_value (base_value);
+  TAO::Arg_Traits< ::CORBA::ValueDef>::in_arg_val _tao_base_value (base_value);
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_truncatable (is_truncatable);
-  TAO::Arg_Traits< CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values (abstract_base_values);
-  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces (supported_interfaces);
-  TAO::Arg_Traits< CORBA::ExtInitializerSeq>::in_arg_val _tao_initializers (initializers);
+  TAO::Arg_Traits< ::CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values (abstract_base_values);
+  TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces (supported_interfaces);
+  TAO::Arg_Traits< ::CORBA::ExtInitializerSeq>::in_arg_val _tao_initializers (initializers);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -896,6 +982,27 @@ CORBA::ComponentIR::Container::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ComponentIR_Container (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/ComponentIR/Container:1.0",
+    "Container");
+  
+namespace CORBA
+{
+  namespace ComponentIR
+  {
+    ::CORBA::TypeCode_ptr const _tc_Container =
+      &_tao_tc_CORBA_ComponentIR_Container;
+  }
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::ComponentIR::ModuleDef.
@@ -1074,6 +1181,27 @@ CORBA::ComponentIR::ModuleDef::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ComponentIR_ModuleDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/ComponentIR/ModuleDef:1.0",
+    "ModuleDef");
+  
+namespace CORBA
+{
+  namespace ComponentIR
+  {
+    ::CORBA::TypeCode_ptr const _tc_ModuleDef =
+      &_tao_tc_CORBA_ComponentIR_ModuleDef;
+  }
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::ComponentIR::Repository.
@@ -1248,6 +1376,27 @@ CORBA::ComponentIR::Repository::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ComponentIR_Repository (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/ComponentIR/Repository:1.0",
+    "Repository");
+  
+namespace CORBA
+{
+  namespace ComponentIR
+  {
+    ::CORBA::TypeCode_ptr const _tc_Repository =
+      &_tao_tc_CORBA_ComponentIR_Repository;
+  }
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::ComponentIR::ProvidesDef.
@@ -1309,7 +1458,7 @@ TAO::Collocation_Proxy_Broker *
       CORBA_ComponentIR_ProvidesDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::InterfaceDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::InterfaceDef>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1353,7 +1502,7 @@ void CORBA::ComponentIR::ProvidesDef::interface_type (
     }
   
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::InterfaceDef>::in_arg_val _tao_interface_type (interface_type);
+  TAO::Arg_Traits< ::CORBA::InterfaceDef>::in_arg_val _tao_interface_type (interface_type);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1497,6 +1646,61 @@ CORBA::ComponentIR::ProvidesDef::marshal (TAO_OutputCDR &cdr)
   return (cdr << this);
 }
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ComponentIR_ProvidesDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/ComponentIR/ProvidesDef:1.0",
+    "ProvidesDef");
+  
+namespace CORBA
+{
+  namespace ComponentIR
+  {
+    ::CORBA::TypeCode_ptr const _tc_ProvidesDef =
+      &_tao_tc_CORBA_ComponentIR_ProvidesDef;
+  }
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ComponentIR_ProvidesDescription[] =
+  {
+    { "name", &CORBA::_tc_Identifier },
+    { "id", &CORBA::_tc_RepositoryId },
+    { "defined_in", &CORBA::_tc_RepositoryId },
+    { "version", &CORBA::_tc_VersionSpec },
+    { "interface_type", &CORBA::_tc_RepositoryId }
+    
+  };
+static TAO::TypeCode::Struct<char const *,
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ComponentIR_ProvidesDescription (
+    CORBA::tk_struct,
+    "IDL:omg.org/CORBA/ComponentIR/ProvidesDescription:1.0",
+    "ProvidesDescription",
+    _tao_fields_CORBA_ComponentIR_ProvidesDescription,
+    5);
+  
+namespace CORBA
+{
+  namespace ComponentIR
+  {
+    ::CORBA::TypeCode_ptr const _tc_ProvidesDescription =
+      &_tao_tc_CORBA_ComponentIR_ProvidesDescription;
+  }
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
@@ -1572,7 +1776,7 @@ TAO::Collocation_Proxy_Broker *
       CORBA_ComponentIR_UsesDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::InterfaceDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::InterfaceDef>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1616,7 +1820,7 @@ void CORBA::ComponentIR::UsesDef::interface_type (
     }
   
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::InterfaceDef>::in_arg_val _tao_interface_type (interface_type);
+  TAO::Arg_Traits< ::CORBA::InterfaceDef>::in_arg_val _tao_interface_type (interface_type);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1845,6 +2049,62 @@ CORBA::ComponentIR::UsesDef::marshal (TAO_OutputCDR &cdr)
   return (cdr << this);
 }
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ComponentIR_UsesDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/ComponentIR/UsesDef:1.0",
+    "UsesDef");
+  
+namespace CORBA
+{
+  namespace ComponentIR
+  {
+    ::CORBA::TypeCode_ptr const _tc_UsesDef =
+      &_tao_tc_CORBA_ComponentIR_UsesDef;
+  }
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ComponentIR_UsesDescription[] =
+  {
+    { "name", &CORBA::_tc_Identifier },
+    { "id", &CORBA::_tc_RepositoryId },
+    { "defined_in", &CORBA::_tc_RepositoryId },
+    { "version", &CORBA::_tc_VersionSpec },
+    { "interface_type", &CORBA::_tc_RepositoryId },
+    { "is_multiple", &CORBA::_tc_boolean }
+    
+  };
+static TAO::TypeCode::Struct<char const *,
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ComponentIR_UsesDescription (
+    CORBA::tk_struct,
+    "IDL:omg.org/CORBA/ComponentIR/UsesDescription:1.0",
+    "UsesDescription",
+    _tao_fields_CORBA_ComponentIR_UsesDescription,
+    6);
+  
+namespace CORBA
+{
+  namespace ComponentIR
+  {
+    ::CORBA::TypeCode_ptr const _tc_UsesDescription =
+      &_tao_tc_CORBA_ComponentIR_UsesDescription;
+  }
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
@@ -1920,7 +2180,7 @@ TAO::Collocation_Proxy_Broker *
       CORBA_ComponentIR_EventPortDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ComponentIR::EventDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::ComponentIR::EventDef>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1964,7 +2224,7 @@ void CORBA::ComponentIR::EventPortDef::event (
     }
   
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::ComponentIR::EventDef>::in_arg_val _tao_event (event);
+  TAO::Arg_Traits< ::CORBA::ComponentIR::EventDef>::in_arg_val _tao_event (event);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2007,7 +2267,7 @@ CORBA::Boolean CORBA::ComponentIR::EventPortDef::is_a (
     }
   
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_event_id (event_id);
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_event_id (event_id);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2153,6 +2413,61 @@ CORBA::ComponentIR::EventPortDef::marshal (TAO_OutputCDR &cdr)
   return (cdr << this);
 }
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ComponentIR_EventPortDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/ComponentIR/EventPortDef:1.0",
+    "EventPortDef");
+  
+namespace CORBA
+{
+  namespace ComponentIR
+  {
+    ::CORBA::TypeCode_ptr const _tc_EventPortDef =
+      &_tao_tc_CORBA_ComponentIR_EventPortDef;
+  }
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ComponentIR_EventPortDescription[] =
+  {
+    { "name", &CORBA::_tc_Identifier },
+    { "id", &CORBA::_tc_RepositoryId },
+    { "defined_in", &CORBA::_tc_RepositoryId },
+    { "version", &CORBA::_tc_VersionSpec },
+    { "event", &CORBA::_tc_RepositoryId }
+    
+  };
+static TAO::TypeCode::Struct<char const *,
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ComponentIR_EventPortDescription (
+    CORBA::tk_struct,
+    "IDL:omg.org/CORBA/ComponentIR/EventPortDescription:1.0",
+    "EventPortDescription",
+    _tao_fields_CORBA_ComponentIR_EventPortDescription,
+    5);
+  
+namespace CORBA
+{
+  namespace ComponentIR
+  {
+    ::CORBA::TypeCode_ptr const _tc_EventPortDescription =
+      &_tao_tc_CORBA_ComponentIR_EventPortDescription;
+  }
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
@@ -2336,6 +2651,27 @@ CORBA::ComponentIR::EmitsDef::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ComponentIR_EmitsDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/ComponentIR/EmitsDef:1.0",
+    "EmitsDef");
+  
+namespace CORBA
+{
+  namespace ComponentIR
+  {
+    ::CORBA::TypeCode_ptr const _tc_EmitsDef =
+      &_tao_tc_CORBA_ComponentIR_EmitsDef;
+  }
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::ComponentIR::PublishesDef.
@@ -2505,6 +2841,27 @@ CORBA::ComponentIR::PublishesDef::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ComponentIR_PublishesDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/ComponentIR/PublishesDef:1.0",
+    "PublishesDef");
+  
+namespace CORBA
+{
+  namespace ComponentIR
+  {
+    ::CORBA::TypeCode_ptr const _tc_PublishesDef =
+      &_tao_tc_CORBA_ComponentIR_PublishesDef;
+  }
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::ComponentIR::ConsumesDef.
@@ -2674,6 +3031,27 @@ CORBA::ComponentIR::ConsumesDef::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ComponentIR_ConsumesDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/ComponentIR/ConsumesDef:1.0",
+    "ConsumesDef");
+  
+namespace CORBA
+{
+  namespace ComponentIR
+  {
+    ::CORBA::TypeCode_ptr const _tc_ConsumesDef =
+      &_tao_tc_CORBA_ComponentIR_ConsumesDef;
+  }
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::ComponentIR::ComponentDef.
@@ -2735,7 +3113,7 @@ TAO::Collocation_Proxy_Broker *
       CORBA_ComponentIR_ComponentDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ComponentIR::ComponentDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::ComponentIR::ComponentDef>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2779,7 +3157,7 @@ void CORBA::ComponentIR::ComponentDef::base_component (
     }
   
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_base_component (base_component);
+  TAO::Arg_Traits< ::CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_base_component (base_component);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2820,7 +3198,7 @@ void CORBA::ComponentIR::ComponentDef::base_component (
       CORBA_ComponentIR_ComponentDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2864,7 +3242,7 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces (
     }
   
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces (supported_interfaces);
+  TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces (supported_interfaces);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2909,11 +3287,11 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces (
       CORBA_ComponentIR_ComponentDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ComponentIR::ProvidesDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::InterfaceDef>::in_arg_val _tao_interface_type (interface_type);
+  TAO::Arg_Traits< ::CORBA::ComponentIR::ProvidesDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::InterfaceDef>::in_arg_val _tao_interface_type (interface_type);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2964,11 +3342,11 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces (
       CORBA_ComponentIR_ComponentDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ComponentIR::UsesDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::InterfaceDef>::in_arg_val _tao_interface_type (interface_type);
+  TAO::Arg_Traits< ::CORBA::ComponentIR::UsesDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::InterfaceDef>::in_arg_val _tao_interface_type (interface_type);
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_multiple (is_multiple);
   
   TAO::Argument *_the_tao_operation_signature [] =
@@ -3020,11 +3398,11 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces (
       CORBA_ComponentIR_ComponentDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ComponentIR::EmitsDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::ComponentIR::EventDef>::in_arg_val _tao_event (event);
+  TAO::Arg_Traits< ::CORBA::ComponentIR::EmitsDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::ComponentIR::EventDef>::in_arg_val _tao_event (event);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -3074,11 +3452,11 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces (
       CORBA_ComponentIR_ComponentDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ComponentIR::PublishesDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::ComponentIR::EventDef>::in_arg_val _tao_event (event);
+  TAO::Arg_Traits< ::CORBA::ComponentIR::PublishesDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::ComponentIR::EventDef>::in_arg_val _tao_event (event);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -3128,11 +3506,11 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces (
       CORBA_ComponentIR_ComponentDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ComponentIR::ConsumesDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::ComponentIR::EventDef>::in_arg_val _tao_event (event);
+  TAO::Arg_Traits< ::CORBA::ComponentIR::ConsumesDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::ComponentIR::EventDef>::in_arg_val _tao_event (event);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -3301,6 +3679,27 @@ CORBA::ComponentIR::ComponentDef::marshal (TAO_OutputCDR &cdr)
   return (cdr << this);
 }
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ComponentIR_ComponentDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/ComponentIR/ComponentDef:1.0",
+    "ComponentDef");
+  
+namespace CORBA
+{
+  namespace ComponentIR
+  {
+    ::CORBA::TypeCode_ptr const _tc_ComponentDef =
+      &_tao_tc_CORBA_ComponentIR_ComponentDef;
+  }
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
@@ -3314,7 +3713,7 @@ CORBA::ComponentIR::ProvidesDescriptionSeq::ProvidesDescriptionSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ComponentIR::ProvidesDescription
+        ProvidesDescription
       >
     (max)
 {}
@@ -3326,7 +3725,7 @@ CORBA::ComponentIR::ProvidesDescriptionSeq::ProvidesDescriptionSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ComponentIR::ProvidesDescription
+        ProvidesDescription
       >
     (max, length, buffer, release)
 {}
@@ -3335,7 +3734,7 @@ CORBA::ComponentIR::ProvidesDescriptionSeq::ProvidesDescriptionSeq (
     const ProvidesDescriptionSeq &seq
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ComponentIR::ProvidesDescription
+        ProvidesDescription
       >
     (seq)
 {}
@@ -3354,6 +3753,57 @@ void CORBA::ComponentIR::ProvidesDescriptionSeq::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+#ifndef _TAO_TYPECODE_CORBA_ComponentIR_ProvidesDescriptionSeq_GUARD
+#define _TAO_TYPECODE_CORBA_ComponentIR_ProvidesDescriptionSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_ComponentIR_ProvidesDescriptionSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::ComponentIR::_tc_ProvidesDescription,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_CORBA_ComponentIR_ProvidesDescriptionSeq_0 =
+      &CORBA_ComponentIR_ProvidesDescriptionSeq_0;
+    
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_ComponentIR_ProvidesDescriptionSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ComponentIR_ProvidesDescriptionSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/ComponentIR/ProvidesDescriptionSeq:1.0",
+    "ProvidesDescriptionSeq",
+    &TAO::TypeCode::tc_CORBA_ComponentIR_ProvidesDescriptionSeq_0);
+  
+namespace CORBA
+{
+  namespace ComponentIR
+  {
+    ::CORBA::TypeCode_ptr const _tc_ProvidesDescriptionSeq =
+      &_tao_tc_CORBA_ComponentIR_ProvidesDescriptionSeq;
+  }
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
@@ -3367,7 +3817,7 @@ CORBA::ComponentIR::UsesDescriptionSeq::UsesDescriptionSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ComponentIR::UsesDescription
+        UsesDescription
       >
     (max)
 {}
@@ -3379,7 +3829,7 @@ CORBA::ComponentIR::UsesDescriptionSeq::UsesDescriptionSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ComponentIR::UsesDescription
+        UsesDescription
       >
     (max, length, buffer, release)
 {}
@@ -3388,7 +3838,7 @@ CORBA::ComponentIR::UsesDescriptionSeq::UsesDescriptionSeq (
     const UsesDescriptionSeq &seq
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ComponentIR::UsesDescription
+        UsesDescription
       >
     (seq)
 {}
@@ -3407,6 +3857,57 @@ void CORBA::ComponentIR::UsesDescriptionSeq::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+#ifndef _TAO_TYPECODE_CORBA_ComponentIR_UsesDescriptionSeq_GUARD
+#define _TAO_TYPECODE_CORBA_ComponentIR_UsesDescriptionSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_ComponentIR_UsesDescriptionSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::ComponentIR::_tc_UsesDescription,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_CORBA_ComponentIR_UsesDescriptionSeq_0 =
+      &CORBA_ComponentIR_UsesDescriptionSeq_0;
+    
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_ComponentIR_UsesDescriptionSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ComponentIR_UsesDescriptionSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/ComponentIR/UsesDescriptionSeq:1.0",
+    "UsesDescriptionSeq",
+    &TAO::TypeCode::tc_CORBA_ComponentIR_UsesDescriptionSeq_0);
+  
+namespace CORBA
+{
+  namespace ComponentIR
+  {
+    ::CORBA::TypeCode_ptr const _tc_UsesDescriptionSeq =
+      &_tao_tc_CORBA_ComponentIR_UsesDescriptionSeq;
+  }
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
@@ -3420,7 +3921,7 @@ CORBA::ComponentIR::EventPortDescriptionSeq::EventPortDescriptionSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ComponentIR::EventPortDescription
+        EventPortDescription
       >
     (max)
 {}
@@ -3432,7 +3933,7 @@ CORBA::ComponentIR::EventPortDescriptionSeq::EventPortDescriptionSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ComponentIR::EventPortDescription
+        EventPortDescription
       >
     (max, length, buffer, release)
 {}
@@ -3441,7 +3942,7 @@ CORBA::ComponentIR::EventPortDescriptionSeq::EventPortDescriptionSeq (
     const EventPortDescriptionSeq &seq
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ComponentIR::EventPortDescription
+        EventPortDescription
       >
     (seq)
 {}
@@ -3460,6 +3961,138 @@ void CORBA::ComponentIR::EventPortDescriptionSeq::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+#ifndef _TAO_TYPECODE_CORBA_ComponentIR_EventPortDescriptionSeq_GUARD
+#define _TAO_TYPECODE_CORBA_ComponentIR_EventPortDescriptionSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_ComponentIR_EventPortDescriptionSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::ComponentIR::_tc_EventPortDescription,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_CORBA_ComponentIR_EventPortDescriptionSeq_0 =
+      &CORBA_ComponentIR_EventPortDescriptionSeq_0;
+    
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_ComponentIR_EventPortDescriptionSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ComponentIR_EventPortDescriptionSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/ComponentIR/EventPortDescriptionSeq:1.0",
+    "EventPortDescriptionSeq",
+    &TAO::TypeCode::tc_CORBA_ComponentIR_EventPortDescriptionSeq_0);
+  
+namespace CORBA
+{
+  namespace ComponentIR
+  {
+    ::CORBA::TypeCode_ptr const _tc_EventPortDescriptionSeq =
+      &_tao_tc_CORBA_ComponentIR_EventPortDescriptionSeq;
+  }
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ComponentIR_ComponentDescription[] =
+  {
+    { "name", &CORBA::_tc_Identifier },
+    { "id", &CORBA::_tc_RepositoryId },
+    { "defined_in", &CORBA::_tc_RepositoryId },
+    { "version", &CORBA::_tc_VersionSpec },
+    { "base_component", &CORBA::_tc_RepositoryId },
+    { "supported_interfaces", &CORBA::_tc_RepositoryIdSeq },
+    { "provided_interfaces", &CORBA::ComponentIR::_tc_ProvidesDescriptionSeq },
+    { "used_interfaces", &CORBA::ComponentIR::_tc_UsesDescriptionSeq },
+    { "emits_events", &CORBA::ComponentIR::_tc_EventPortDescriptionSeq },
+    { "publishes_events", &CORBA::ComponentIR::_tc_EventPortDescriptionSeq },
+    { "consumes_events", &CORBA::ComponentIR::_tc_EventPortDescriptionSeq },
+    { "attributes", &CORBA::_tc_ExtAttrDescriptionSeq },
+    { "type", &CORBA::_tc_TypeCode }
+    
+  };
+static TAO::TypeCode::Recursive_Type<
+  TAO::TypeCode::Struct<char const *,
+                        CORBA::TypeCode_ptr const *,
+                        TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                        TAO::Null_RefCount_Policy>,
+  CORBA::TypeCode_ptr const *,
+  TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * >
+
+  _tao_tc_CORBA_ComponentIR_ComponentDescription (
+    CORBA::tk_struct,
+    "IDL:omg.org/CORBA/ComponentIR/ComponentDescription:1.0",
+    "ComponentDescription",
+    _tao_fields_CORBA_ComponentIR_ComponentDescription,
+    13);
+  
+namespace CORBA
+{
+  namespace ComponentIR
+  {
+    ::CORBA::TypeCode_ptr const _tc_ComponentDescription =
+      &_tao_tc_CORBA_ComponentIR_ComponentDescription;
+  }
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
@@ -3643,6 +4276,27 @@ CORBA::ComponentIR::FactoryDef::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ComponentIR_FactoryDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/ComponentIR/FactoryDef:1.0",
+    "FactoryDef");
+  
+namespace CORBA
+{
+  namespace ComponentIR
+  {
+    ::CORBA::TypeCode_ptr const _tc_FactoryDef =
+      &_tao_tc_CORBA_ComponentIR_FactoryDef;
+  }
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::ComponentIR::FinderDef.
@@ -3812,6 +4466,27 @@ CORBA::ComponentIR::FinderDef::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ComponentIR_FinderDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/ComponentIR/FinderDef:1.0",
+    "FinderDef");
+  
+namespace CORBA
+{
+  namespace ComponentIR
+  {
+    ::CORBA::TypeCode_ptr const _tc_FinderDef =
+      &_tao_tc_CORBA_ComponentIR_FinderDef;
+  }
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::ComponentIR::HomeDef.
@@ -3873,7 +4548,7 @@ TAO::Collocation_Proxy_Broker *
       CORBA_ComponentIR_HomeDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ComponentIR::HomeDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::ComponentIR::HomeDef>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -3917,7 +4592,7 @@ void CORBA::ComponentIR::HomeDef::base_home (
     }
   
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::ComponentIR::HomeDef>::in_arg_val _tao_base_home (base_home);
+  TAO::Arg_Traits< ::CORBA::ComponentIR::HomeDef>::in_arg_val _tao_base_home (base_home);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -3958,7 +4633,7 @@ void CORBA::ComponentIR::HomeDef::base_home (
       CORBA_ComponentIR_HomeDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -4002,7 +4677,7 @@ void CORBA::ComponentIR::HomeDef::supported_interfaces (
     }
   
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces (supported_interfaces);
+  TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces (supported_interfaces);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -4043,7 +4718,7 @@ void CORBA::ComponentIR::HomeDef::supported_interfaces (
       CORBA_ComponentIR_HomeDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ComponentIR::ComponentDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::ComponentIR::ComponentDef>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -4087,7 +4762,7 @@ void CORBA::ComponentIR::HomeDef::managed_component (
     }
   
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_managed_component (managed_component);
+  TAO::Arg_Traits< ::CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_managed_component (managed_component);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -4128,7 +4803,7 @@ void CORBA::ComponentIR::HomeDef::managed_component (
       CORBA_ComponentIR_HomeDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ValueDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::ValueDef>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -4172,7 +4847,7 @@ void CORBA::ComponentIR::HomeDef::primary_key (
     }
   
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::ValueDef>::in_arg_val _tao_primary_key (primary_key);
+  TAO::Arg_Traits< ::CORBA::ValueDef>::in_arg_val _tao_primary_key (primary_key);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -4218,12 +4893,12 @@ void CORBA::ComponentIR::HomeDef::primary_key (
       CORBA_ComponentIR_HomeDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ComponentIR::FactoryDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::ParDescriptionSeq>::in_arg_val _tao_params (params);
-  TAO::Arg_Traits< CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions (exceptions);
+  TAO::Arg_Traits< ::CORBA::ComponentIR::FactoryDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_val _tao_params (params);
+  TAO::Arg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions (exceptions);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -4275,12 +4950,12 @@ void CORBA::ComponentIR::HomeDef::primary_key (
       CORBA_ComponentIR_HomeDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ComponentIR::FinderDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::ParDescriptionSeq>::in_arg_val _tao_params (params);
-  TAO::Arg_Traits< CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions (exceptions);
+  TAO::Arg_Traits< ::CORBA::ComponentIR::FinderDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_val _tao_params (params);
+  TAO::Arg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions (exceptions);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -4450,6 +5125,92 @@ CORBA::ComponentIR::HomeDef::marshal (TAO_OutputCDR &cdr)
   return (cdr << this);
 }
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ComponentIR_HomeDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/ComponentIR/HomeDef:1.0",
+    "HomeDef");
+  
+namespace CORBA
+{
+  namespace ComponentIR
+  {
+    ::CORBA::TypeCode_ptr const _tc_HomeDef =
+      &_tao_tc_CORBA_ComponentIR_HomeDef;
+  }
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ComponentIR_HomeDescription[] =
+  {
+    { "name", &CORBA::_tc_Identifier },
+    { "id", &CORBA::_tc_RepositoryId },
+    { "defined_in", &CORBA::_tc_RepositoryId },
+    { "version", &CORBA::_tc_VersionSpec },
+    { "base_home", &CORBA::_tc_RepositoryId },
+    { "managed_component", &CORBA::_tc_RepositoryId },
+    { "primary_key", &CORBA::_tc_ValueDescription },
+    { "factories", &CORBA::_tc_OpDescriptionSeq },
+    { "finders", &CORBA::_tc_OpDescriptionSeq },
+    { "operations", &CORBA::_tc_OpDescriptionSeq },
+    { "attributes", &CORBA::_tc_ExtAttrDescriptionSeq },
+    { "type", &CORBA::_tc_TypeCode }
+    
+  };
+static TAO::TypeCode::Recursive_Type<
+  TAO::TypeCode::Struct<char const *,
+                        CORBA::TypeCode_ptr const *,
+                        TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                        TAO::Null_RefCount_Policy>,
+  CORBA::TypeCode_ptr const *,
+  TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * >
+
+  _tao_tc_CORBA_ComponentIR_HomeDescription (
+    CORBA::tk_struct,
+    "IDL:omg.org/CORBA/ComponentIR/HomeDescription:1.0",
+    "HomeDescription",
+    _tao_fields_CORBA_ComponentIR_HomeDescription,
+    12);
+  
+namespace CORBA
+{
+  namespace ComponentIR
+  {
+    ::CORBA::TypeCode_ptr const _tc_HomeDescription =
+      &_tao_tc_CORBA_ComponentIR_HomeDescription;
+  }
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
@@ -4464,6 +5225,1285 @@ CORBA::ComponentIR::HomeDescription::_tao_any_destructor (
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::ComponentIR::EventDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::EventDef_ptr _tao_elem
+  )
+{
+  CORBA::ComponentIR::EventDef_ptr _tao_objptr =
+    CORBA::ComponentIR::EventDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::EventDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::ComponentIR::EventDef>::insert (
+      _tao_any,
+      CORBA::ComponentIR::EventDef::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_EventDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ComponentIR::EventDef_ptr &_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
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::ComponentIR::Container>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::Container_ptr _tao_elem
+  )
+{
+  CORBA::ComponentIR::Container_ptr _tao_objptr =
+    CORBA::ComponentIR::Container::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::Container_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::ComponentIR::Container>::insert (
+      _tao_any,
+      CORBA::ComponentIR::Container::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_Container,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ComponentIR::Container_ptr &_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
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::ComponentIR::ModuleDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::ModuleDef_ptr _tao_elem
+  )
+{
+  CORBA::ComponentIR::ModuleDef_ptr _tao_objptr =
+    CORBA::ComponentIR::ModuleDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::ModuleDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::ComponentIR::ModuleDef>::insert (
+      _tao_any,
+      CORBA::ComponentIR::ModuleDef::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_ModuleDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ComponentIR::ModuleDef_ptr &_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
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::ComponentIR::Repository>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::Repository_ptr _tao_elem
+  )
+{
+  CORBA::ComponentIR::Repository_ptr _tao_objptr =
+    CORBA::ComponentIR::Repository::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::Repository_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::ComponentIR::Repository>::insert (
+      _tao_any,
+      CORBA::ComponentIR::Repository::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_Repository,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ComponentIR::Repository_ptr &_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
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::ComponentIR::ProvidesDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::ProvidesDef_ptr _tao_elem
+  )
+{
+  CORBA::ComponentIR::ProvidesDef_ptr _tao_objptr =
+    CORBA::ComponentIR::ProvidesDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::ProvidesDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::ComponentIR::ProvidesDef>::insert (
+      _tao_any,
+      CORBA::ComponentIR::ProvidesDef::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_ProvidesDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ComponentIR::ProvidesDef_ptr &_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
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ComponentIR::ProvidesDescription &_tao_elem
+  )
+{
+  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,
+    CORBA::ComponentIR::ProvidesDescription *_tao_elem
+  )
+{
+  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,
+    CORBA::ComponentIR::ProvidesDescription *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::ComponentIR::ProvidesDescription *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ComponentIR::ProvidesDescription *&_tao_elem
+  )
+{
+  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_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::ComponentIR::UsesDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::UsesDef_ptr _tao_elem
+  )
+{
+  CORBA::ComponentIR::UsesDef_ptr _tao_objptr =
+    CORBA::ComponentIR::UsesDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::UsesDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::ComponentIR::UsesDef>::insert (
+      _tao_any,
+      CORBA::ComponentIR::UsesDef::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_UsesDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ComponentIR::UsesDef_ptr &_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
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ComponentIR::UsesDescription &_tao_elem
+  )
+{
+  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,
+    CORBA::ComponentIR::UsesDescription *_tao_elem
+  )
+{
+  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,
+    CORBA::ComponentIR::UsesDescription *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::ComponentIR::UsesDescription *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ComponentIR::UsesDescription *&_tao_elem
+  )
+{
+  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_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::ComponentIR::EventPortDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::EventPortDef_ptr _tao_elem
+  )
+{
+  CORBA::ComponentIR::EventPortDef_ptr _tao_objptr =
+    CORBA::ComponentIR::EventPortDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::EventPortDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::ComponentIR::EventPortDef>::insert (
+      _tao_any,
+      CORBA::ComponentIR::EventPortDef::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_EventPortDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ComponentIR::EventPortDef_ptr &_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
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ComponentIR::EventPortDescription &_tao_elem
+  )
+{
+  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,
+    CORBA::ComponentIR::EventPortDescription *_tao_elem
+  )
+{
+  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,
+    CORBA::ComponentIR::EventPortDescription *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::ComponentIR::EventPortDescription *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ComponentIR::EventPortDescription *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ComponentIR::EventPortDescription>::extract (
+        _tao_any,
+        CORBA::ComponentIR::EventPortDescription::_tao_any_destructor,
+        CORBA::ComponentIR::_tc_EventPortDescription,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::ComponentIR::EmitsDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::EmitsDef_ptr _tao_elem
+  )
+{
+  CORBA::ComponentIR::EmitsDef_ptr _tao_objptr =
+    CORBA::ComponentIR::EmitsDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::EmitsDef_ptr *_tao_elem
+  )
+{
+  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,
+    CORBA::ComponentIR::EmitsDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::ComponentIR::EmitsDef>::extract (
+        _tao_any,
+        CORBA::ComponentIR::EmitsDef::_tao_any_destructor,
+        CORBA::ComponentIR::_tc_EmitsDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::ComponentIR::PublishesDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::PublishesDef_ptr _tao_elem
+  )
+{
+  CORBA::ComponentIR::PublishesDef_ptr _tao_objptr =
+    CORBA::ComponentIR::PublishesDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::PublishesDef_ptr *_tao_elem
+  )
+{
+  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,
+    CORBA::ComponentIR::PublishesDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::ComponentIR::PublishesDef>::extract (
+        _tao_any,
+        CORBA::ComponentIR::PublishesDef::_tao_any_destructor,
+        CORBA::ComponentIR::_tc_PublishesDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::ComponentIR::ConsumesDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::ConsumesDef_ptr _tao_elem
+  )
+{
+  CORBA::ComponentIR::ConsumesDef_ptr _tao_objptr =
+    CORBA::ComponentIR::ConsumesDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::ConsumesDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::ComponentIR::ConsumesDef>::insert (
+      _tao_any,
+      CORBA::ComponentIR::ConsumesDef::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_ConsumesDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ComponentIR::ConsumesDef_ptr &_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
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::ComponentIR::ComponentDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::ComponentDef_ptr _tao_elem
+  )
+{
+  CORBA::ComponentIR::ComponentDef_ptr _tao_objptr =
+    CORBA::ComponentIR::ComponentDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::ComponentDef_ptr *_tao_elem
+  )
+{
+  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,
+    CORBA::ComponentIR::ComponentDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::ComponentIR::ComponentDef>::extract (
+        _tao_any,
+        CORBA::ComponentIR::ComponentDef::_tao_any_destructor,
+        CORBA::ComponentIR::_tc_ComponentDef,
+        _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::ComponentIR::ProvidesDescriptionSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::ProvidesDescriptionSeq>::insert_copy (
+      _tao_any,
+      CORBA::ComponentIR::ProvidesDescriptionSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ComponentIR_ProvidesDescriptionSeq_0,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::ProvidesDescriptionSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::ProvidesDescriptionSeq>::insert (
+      _tao_any,
+      CORBA::ComponentIR::ProvidesDescriptionSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ComponentIR_ProvidesDescriptionSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ComponentIR::ProvidesDescriptionSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::ComponentIR::ProvidesDescriptionSeq *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ComponentIR::ProvidesDescriptionSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ComponentIR::ProvidesDescriptionSeq>::extract (
+        _tao_any,
+        CORBA::ComponentIR::ProvidesDescriptionSeq::_tao_any_destructor,
+        TAO::TypeCode::tc_CORBA_ComponentIR_ProvidesDescriptionSeq_0,
+        _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::ComponentIR::UsesDescriptionSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::UsesDescriptionSeq>::insert_copy (
+      _tao_any,
+      CORBA::ComponentIR::UsesDescriptionSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ComponentIR_UsesDescriptionSeq_0,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::UsesDescriptionSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::UsesDescriptionSeq>::insert (
+      _tao_any,
+      CORBA::ComponentIR::UsesDescriptionSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ComponentIR_UsesDescriptionSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ComponentIR::UsesDescriptionSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::ComponentIR::UsesDescriptionSeq *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ComponentIR::UsesDescriptionSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ComponentIR::UsesDescriptionSeq>::extract (
+        _tao_any,
+        CORBA::ComponentIR::UsesDescriptionSeq::_tao_any_destructor,
+        TAO::TypeCode::tc_CORBA_ComponentIR_UsesDescriptionSeq_0,
+        _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::ComponentIR::EventPortDescriptionSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::EventPortDescriptionSeq>::insert_copy (
+      _tao_any,
+      CORBA::ComponentIR::EventPortDescriptionSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ComponentIR_EventPortDescriptionSeq_0,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::EventPortDescriptionSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::EventPortDescriptionSeq>::insert (
+      _tao_any,
+      CORBA::ComponentIR::EventPortDescriptionSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ComponentIR_EventPortDescriptionSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ComponentIR::EventPortDescriptionSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::ComponentIR::EventPortDescriptionSeq *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ComponentIR::EventPortDescriptionSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ComponentIR::EventPortDescriptionSeq>::extract (
+        _tao_any,
+        CORBA::ComponentIR::EventPortDescriptionSeq::_tao_any_destructor,
+        TAO::TypeCode::tc_CORBA_ComponentIR_EventPortDescriptionSeq_0,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ComponentIR::ComponentDescription &_tao_elem
+  )
+{
+  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,
+    CORBA::ComponentIR::ComponentDescription *_tao_elem
+  )
+{
+  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,
+    CORBA::ComponentIR::ComponentDescription *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::ComponentIR::ComponentDescription *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ComponentIR::ComponentDescription *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ComponentIR::ComponentDescription>::extract (
+        _tao_any,
+        CORBA::ComponentIR::ComponentDescription::_tao_any_destructor,
+        CORBA::ComponentIR::_tc_ComponentDescription,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::ComponentIR::FactoryDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::FactoryDef_ptr _tao_elem
+  )
+{
+  CORBA::ComponentIR::FactoryDef_ptr _tao_objptr =
+    CORBA::ComponentIR::FactoryDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::FactoryDef_ptr *_tao_elem
+  )
+{
+  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,
+    CORBA::ComponentIR::FactoryDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::ComponentIR::FactoryDef>::extract (
+        _tao_any,
+        CORBA::ComponentIR::FactoryDef::_tao_any_destructor,
+        CORBA::ComponentIR::_tc_FactoryDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::ComponentIR::FinderDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::FinderDef_ptr _tao_elem
+  )
+{
+  CORBA::ComponentIR::FinderDef_ptr _tao_objptr =
+    CORBA::ComponentIR::FinderDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::FinderDef_ptr *_tao_elem
+  )
+{
+  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,
+    CORBA::ComponentIR::FinderDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::ComponentIR::FinderDef>::extract (
+        _tao_any,
+        CORBA::ComponentIR::FinderDef::_tao_any_destructor,
+        CORBA::ComponentIR::_tc_FinderDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::ComponentIR::HomeDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::HomeDef_ptr _tao_elem
+  )
+{
+  CORBA::ComponentIR::HomeDef_ptr _tao_objptr =
+    CORBA::ComponentIR::HomeDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::HomeDef_ptr *_tao_elem
+  )
+{
+  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,
+    CORBA::ComponentIR::HomeDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::ComponentIR::HomeDef>::extract (
+        _tao_any,
+        CORBA::ComponentIR::HomeDef::_tao_any_destructor,
+        CORBA::ComponentIR::_tc_HomeDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ComponentIR::HomeDescription &_tao_elem
+  )
+{
+  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,
+    CORBA::ComponentIR::HomeDescription *_tao_elem
+  )
+{
+  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,
+    CORBA::ComponentIR::HomeDescription *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::ComponentIR::HomeDescription *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ComponentIR::HomeDescription *&_tao_elem
+  )
+{
+  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/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
@@ -4722,7 +6762,7 @@ CORBA::Boolean operator<< (
     (strm << _tao_aggregate.defined_in.in ()) &&
     (strm << _tao_aggregate.version.in ()) &&
     (strm << _tao_aggregate.interface_type.in ()) &&
-    (strm << CORBA::Any::from_boolean (_tao_aggregate.is_multiple));
+    (strm << ACE_OutputCDR::from_boolean (_tao_aggregate.is_multiple));
 }
 
 CORBA::Boolean operator>> (
@@ -4736,7 +6776,7 @@ CORBA::Boolean operator>> (
     (strm >> _tao_aggregate.defined_in.out ()) &&
     (strm >> _tao_aggregate.version.out ()) &&
     (strm >> _tao_aggregate.interface_type.out ()) &&
-    (strm >> CORBA::Any::to_boolean (_tao_aggregate.is_multiple));
+    (strm >> ACE_InputCDR::to_boolean (_tao_aggregate.is_multiple));
 }
 
 // TAO_IDL - Generated from
diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.h b/TAO/tao/IFR_Client/IFR_ComponentsC.h
index 5d35ae15ad8..ad47576bc3f 100644
--- a/TAO/tao/IFR_Client/IFR_ComponentsC.h
+++ b/TAO/tao/IFR_Client/IFR_ComponentsC.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
 #ifndef _TAO_IDL_ORIG_IFR_COMPONENTSC_H_
 #define _TAO_IDL_ORIG_IFR_COMPONENTSC_H_
@@ -45,8 +45,8 @@
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
-#include "tao/TypeCode.h"
-#include "tao/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/Sequence_T.h"
 #include "tao/Objref_VarOut_T.h"
 #include "tao/Seq_Var_T.h"
@@ -242,7 +242,7 @@ namespace CORBA
 #endif /* end #if !defined */
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_EventDef;
     
@@ -404,7 +404,7 @@ namespace CORBA
 #endif /* end #if !defined */
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_Container;
     
@@ -515,7 +515,7 @@ namespace CORBA
 #endif /* end #if !defined */
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ModuleDef;
     
@@ -626,7 +626,7 @@ namespace CORBA
 #endif /* end #if !defined */
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_Repository;
     
@@ -757,7 +757,7 @@ namespace CORBA
 #endif /* end #if !defined */
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ProvidesDef;
     
@@ -780,7 +780,7 @@ namespace CORBA
       ProvidesDescription_out;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_structure/structure_ch.cpp:52
+    // be\be_visitor_structure/structure_ch.cpp:57
     
     struct TAO_IFR_Client_Export ProvidesDescription
     {
@@ -795,7 +795,7 @@ namespace CORBA
     };
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ProvidesDescription;
     
@@ -947,7 +947,7 @@ namespace CORBA
 #endif /* end #if !defined */
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_UsesDef;
     
@@ -970,7 +970,7 @@ namespace CORBA
       UsesDescription_out;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_structure/structure_ch.cpp:52
+    // be\be_visitor_structure/structure_ch.cpp:57
     
     struct TAO_IFR_Client_Export UsesDescription
     {
@@ -986,7 +986,7 @@ namespace CORBA
     };
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_UsesDescription;
     
@@ -1128,7 +1128,7 @@ namespace CORBA
 #endif /* end #if !defined */
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_EventPortDef;
     
@@ -1151,7 +1151,7 @@ namespace CORBA
       EventPortDescription_out;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_structure/structure_ch.cpp:52
+    // be\be_visitor_structure/structure_ch.cpp:57
     
     struct TAO_IFR_Client_Export EventPortDescription
     {
@@ -1166,7 +1166,7 @@ namespace CORBA
     };
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_EventPortDescription;
     
@@ -1276,7 +1276,7 @@ namespace CORBA
 #endif /* end #if !defined */
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_EmitsDef;
     
@@ -1386,7 +1386,7 @@ namespace CORBA
 #endif /* end #if !defined */
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_PublishesDef;
     
@@ -1496,7 +1496,7 @@ namespace CORBA
 #endif /* end #if !defined */
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ConsumesDef;
     
@@ -1696,7 +1696,7 @@ namespace CORBA
 #endif /* end #if !defined */
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ComponentDef;
     
@@ -1749,7 +1749,7 @@ namespace CORBA
 #endif /* end #if !defined */
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ProvidesDescriptionSeq;
     
@@ -1802,7 +1802,7 @@ namespace CORBA
 #endif /* end #if !defined */
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_UsesDescriptionSeq;
     
@@ -1855,7 +1855,7 @@ namespace CORBA
 #endif /* end #if !defined */
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_EventPortDescriptionSeq;
     
@@ -1878,7 +1878,7 @@ namespace CORBA
       ComponentDescription_out;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_structure/structure_ch.cpp:52
+    // be\be_visitor_structure/structure_ch.cpp:57
     
     struct TAO_IFR_Client_Export ComponentDescription
     {
@@ -1901,7 +1901,7 @@ namespace CORBA
     };
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ComponentDescription;
     
@@ -2011,7 +2011,7 @@ namespace CORBA
 #endif /* end #if !defined */
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_FactoryDef;
     
@@ -2121,7 +2121,7 @@ namespace CORBA
 #endif /* end #if !defined */
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_FinderDef;
     
@@ -2322,7 +2322,7 @@ namespace CORBA
 #endif /* end #if !defined */
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_HomeDef;
     
@@ -2345,7 +2345,7 @@ namespace CORBA
       HomeDescription_out;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_structure/structure_ch.cpp:52
+    // be\be_visitor_structure/structure_ch.cpp:57
     
     struct TAO_IFR_Client_Export HomeDescription
     {
@@ -2367,7 +2367,7 @@ namespace CORBA
     };
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_HomeDescription;
   
@@ -2477,50 +2477,8 @@ TAO::Collocation_Proxy_Broker *
 namespace TAO
 {
 
-#if !defined (_CORBA_COMPONENTIR_COMPONENTDEF__TRAITS_CH_)
-#define _CORBA_COMPONENTIR_COMPONENTDEF__TRAITS_CH_
-  
-  template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::ComponentDef>
-  {
-    static ::CORBA::ComponentIR::ComponentDef_ptr duplicate (
-        ::CORBA::ComponentIR::ComponentDef_ptr
-      );
-    static void release (
-        ::CORBA::ComponentIR::ComponentDef_ptr
-      );
-    static ::CORBA::ComponentIR::ComponentDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::ComponentIR::ComponentDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_HOMEDEF__TRAITS_CH_)
-#define _CORBA_COMPONENTIR_HOMEDEF__TRAITS_CH_
-  
-  template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::HomeDef>
-  {
-    static ::CORBA::ComponentIR::HomeDef_ptr duplicate (
-        ::CORBA::ComponentIR::HomeDef_ptr
-      );
-    static void release (
-        ::CORBA::ComponentIR::HomeDef_ptr
-      );
-    static ::CORBA::ComponentIR::HomeDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::ComponentIR::HomeDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_EVENTDEF__TRAITS_CH_)
-#define _CORBA_COMPONENTIR_EVENTDEF__TRAITS_CH_
+#if !defined (_CORBA_COMPONENTIR_EVENTDEF__TRAITS_)
+#define _CORBA_COMPONENTIR_EVENTDEF__TRAITS_
   
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::EventDef>
@@ -2540,8 +2498,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_COMPONENTIR_CONTAINER__TRAITS_CH_)
-#define _CORBA_COMPONENTIR_CONTAINER__TRAITS_CH_
+#if !defined (_CORBA_COMPONENTIR_CONTAINER__TRAITS_)
+#define _CORBA_COMPONENTIR_CONTAINER__TRAITS_
   
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::Container>
@@ -2561,8 +2519,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_COMPONENTIR_MODULEDEF__TRAITS_CH_)
-#define _CORBA_COMPONENTIR_MODULEDEF__TRAITS_CH_
+#if !defined (_CORBA_COMPONENTIR_MODULEDEF__TRAITS_)
+#define _CORBA_COMPONENTIR_MODULEDEF__TRAITS_
   
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::ModuleDef>
@@ -2582,8 +2540,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_COMPONENTIR_REPOSITORY__TRAITS_CH_)
-#define _CORBA_COMPONENTIR_REPOSITORY__TRAITS_CH_
+#if !defined (_CORBA_COMPONENTIR_REPOSITORY__TRAITS_)
+#define _CORBA_COMPONENTIR_REPOSITORY__TRAITS_
   
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::Repository>
@@ -2603,8 +2561,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_COMPONENTIR_PROVIDESDEF__TRAITS_CH_)
-#define _CORBA_COMPONENTIR_PROVIDESDEF__TRAITS_CH_
+#if !defined (_CORBA_COMPONENTIR_PROVIDESDEF__TRAITS_)
+#define _CORBA_COMPONENTIR_PROVIDESDEF__TRAITS_
   
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::ProvidesDef>
@@ -2624,8 +2582,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_COMPONENTIR_USESDEF__TRAITS_CH_)
-#define _CORBA_COMPONENTIR_USESDEF__TRAITS_CH_
+#if !defined (_CORBA_COMPONENTIR_USESDEF__TRAITS_)
+#define _CORBA_COMPONENTIR_USESDEF__TRAITS_
   
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::UsesDef>
@@ -2645,8 +2603,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_COMPONENTIR_EVENTPORTDEF__TRAITS_CH_)
-#define _CORBA_COMPONENTIR_EVENTPORTDEF__TRAITS_CH_
+#if !defined (_CORBA_COMPONENTIR_EVENTPORTDEF__TRAITS_)
+#define _CORBA_COMPONENTIR_EVENTPORTDEF__TRAITS_
   
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::EventPortDef>
@@ -2666,8 +2624,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_COMPONENTIR_EMITSDEF__TRAITS_CH_)
-#define _CORBA_COMPONENTIR_EMITSDEF__TRAITS_CH_
+#if !defined (_CORBA_COMPONENTIR_EMITSDEF__TRAITS_)
+#define _CORBA_COMPONENTIR_EMITSDEF__TRAITS_
   
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::EmitsDef>
@@ -2687,8 +2645,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_COMPONENTIR_PUBLISHESDEF__TRAITS_CH_)
-#define _CORBA_COMPONENTIR_PUBLISHESDEF__TRAITS_CH_
+#if !defined (_CORBA_COMPONENTIR_PUBLISHESDEF__TRAITS_)
+#define _CORBA_COMPONENTIR_PUBLISHESDEF__TRAITS_
   
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::PublishesDef>
@@ -2708,8 +2666,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_COMPONENTIR_CONSUMESDEF__TRAITS_CH_)
-#define _CORBA_COMPONENTIR_CONSUMESDEF__TRAITS_CH_
+#if !defined (_CORBA_COMPONENTIR_CONSUMESDEF__TRAITS_)
+#define _CORBA_COMPONENTIR_CONSUMESDEF__TRAITS_
   
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::ConsumesDef>
@@ -2729,8 +2687,29 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_COMPONENTIR_FACTORYDEF__TRAITS_CH_)
-#define _CORBA_COMPONENTIR_FACTORYDEF__TRAITS_CH_
+#if !defined (_CORBA_COMPONENTIR_COMPONENTDEF__TRAITS_)
+#define _CORBA_COMPONENTIR_COMPONENTDEF__TRAITS_
+  
+  template<>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::ComponentDef>
+  {
+    static ::CORBA::ComponentIR::ComponentDef_ptr duplicate (
+        ::CORBA::ComponentIR::ComponentDef_ptr
+      );
+    static void release (
+        ::CORBA::ComponentIR::ComponentDef_ptr
+      );
+    static ::CORBA::ComponentIR::ComponentDef_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::CORBA::ComponentIR::ComponentDef_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_COMPONENTIR_FACTORYDEF__TRAITS_)
+#define _CORBA_COMPONENTIR_FACTORYDEF__TRAITS_
   
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::FactoryDef>
@@ -2750,8 +2729,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_COMPONENTIR_FINDERDEF__TRAITS_CH_)
-#define _CORBA_COMPONENTIR_FINDERDEF__TRAITS_CH_
+#if !defined (_CORBA_COMPONENTIR_FINDERDEF__TRAITS_)
+#define _CORBA_COMPONENTIR_FINDERDEF__TRAITS_
   
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::FinderDef>
@@ -2770,45 +2749,66 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
+
+#if !defined (_CORBA_COMPONENTIR_HOMEDEF__TRAITS_)
+#define _CORBA_COMPONENTIR_HOMEDEF__TRAITS_
+  
+  template<>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::HomeDef>
+  {
+    static ::CORBA::ComponentIR::HomeDef_ptr duplicate (
+        ::CORBA::ComponentIR::HomeDef_ptr
+      );
+    static void release (
+        ::CORBA::ComponentIR::HomeDef_ptr
+      );
+    static ::CORBA::ComponentIR::HomeDef_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::CORBA::ComponentIR::HomeDef_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 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_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 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_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 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_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 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_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 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_structure/any_op_ch.cpp:52
+// be\be_visitor_structure/any_op_ch.cpp:53
 
 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
@@ -2816,14 +2816,14 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Com
 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
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 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_structure/any_op_ch.cpp:52
+// be\be_visitor_structure/any_op_ch.cpp:53
 
 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
@@ -2831,14 +2831,14 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Com
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ComponentIR::UsesDescription *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 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_structure/any_op_ch.cpp:52
+// be\be_visitor_structure/any_op_ch.cpp:53
 
 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
@@ -2846,35 +2846,35 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Com
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ComponentIR::EventPortDescription *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 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_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 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_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 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
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 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_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 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
@@ -2882,7 +2882,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Com
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ComponentIR::ProvidesDescriptionSeq *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 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
@@ -2890,7 +2890,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Com
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ComponentIR::UsesDescriptionSeq *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 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
@@ -2898,7 +2898,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Com
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ComponentIR::EventPortDescriptionSeq *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
+// be\be_visitor_structure/any_op_ch.cpp:53
 
 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
@@ -2906,28 +2906,28 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Com
 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
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 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_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 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
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 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
+// be\be_visitor_structure/any_op_ch.cpp:53
 
 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
@@ -3100,7 +3100,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::C
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ComponentIR::HomeDescription &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
+// be\be_codegen.cpp:1136
 
 #if defined (__ACE_INLINE__)
 #include "IFR_ComponentsC.inl"
diff --git a/TAO/tao/IFR_Client/IFR_Extended.pidl b/TAO/tao/IFR_Client/IFR_Extended.pidl
index 7a6a0ee51c8..e0c06ce2c57 100644
--- a/TAO/tao/IFR_Client/IFR_Extended.pidl
+++ b/TAO/tao/IFR_Client/IFR_Extended.pidl
@@ -1,62 +1,57 @@
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO_IFR_Client
-//
-// = FILENAME
-//   IFR_Extended.pidl
-//
-// = DESCRIPTION
-//   This file was used to generate the code in IFR_ExtendedC.{h,i,cpp}.
-//   The original file Interface.idl was split into four pieces, to
-//   keep the generated files to a manageable size and reduce build
-//   time. This IDL file contains all the interfaces and other data
-//   types related to fixed types and valuetypes.
-//
-//   The command used to generate code from this IDL file is:
-//
-//     tao_idl -Ge 1 -Sc -I../.. -GA \
-//          -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
-//
-//   Only the stub files are used in the TAO_IFR_Client library. The
-//   skeleton files can be deleted from this directory.
-//
-//   No patching of the generated stub files is necessary.
-//
-//   To generate the skeleton files for the IFR Service, the command is:
-//
-//     tao_idl -o ../../orbsvcs/orbsvcs/IFRService -Ge 1 \
-//          -Wb,pre_include="ace/pre.h" \
-//          -Wb,post_include="ace/post.h" \
-//          IFR_Extended.pidl
-//
-//   The only modification necessary to the skelton files is to
-//   change
-//
-//   #include "IFR_ExtendedC.h"
-//
-//   to
-//
-//   #include "tao/IFR_Client/IFR_ExtendedC.h"
-//
-//   in IFR_ExtendedS.h. The stub files may be deleted from the IFRService
-//   directory.
-//
-// ================================================================
+// -*- IDL -*-
+
+/**
+ * @file IFR_Extended.pidl
+ *
+ * $Id$
+ *
+ *   This file was used to generate the code in IFR_ExtendedC.{h,i,cpp}.
+ *   The original file Interface.idl was split into four pieces, to
+ *   keep the generated files to a manageable size and reduce build
+ *   time. This IDL file contains all the interfaces and other data
+ *   types related to fixed types and valuetypes.
+ *
+ *   The command used to generate code from this IDL file is:
+ *
+ *     tao_idl -Ge 1 -Sc -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
+ *
+ *   Only the stub files are used in the TAO_IFR_Client library. The
+ *   skeleton files can be deleted from this directory.
+ *
+ *   No patching of the generated stub files is necessary.
+ *
+ *   To generate the skeleton files for the IFR Service, the command is:
+ *
+ *     tao_idl -o ../../orbsvcs/orbsvcs/IFRService -Ge 1 \
+ *          -Wb,pre_include="ace/pre.h" \
+ *          -Wb,post_include="ace/post.h" \
+ *          IFR_Extended.pidl
+ *
+ *   The only modification necessary to the skelton files is to
+ *   change
+ *
+ *   #include "IFR_ExtendedC.h"
+ *
+ *   to
+ *
+ *   #include "tao/IFR_Client/IFR_ExtendedC.h"
+ *
+ *   in IFR_ExtendedS.h. The stub files may be deleted from the IFRService
+ *   directory.
+ *
+ */
 
 #ifndef _IFR_EXTENDED_IDL_
 #define _IFR_EXTENDED_IDL_
 
 #include "tao/IFR_Client/IFR_Basic.pidl"
-#include <Visibility.pidl>
-#include <ValueModifier.pidl>
+#include "tao/AnyTypeCode/Visibility.pidl"
+#include "tao/AnyTypeCode/ValueModifier.pidl"
 
 module CORBA
 {
diff --git a/TAO/tao/IFR_Client/IFR_ExtendedA.cpp b/TAO/tao/IFR_Client/IFR_ExtendedA.cpp
deleted file mode 100644
index 8fe4284ea71..00000000000
--- a/TAO/tao/IFR_Client/IFR_ExtendedA.cpp
+++ /dev/null
@@ -1,903 +0,0 @@
-// -*- 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/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "IFR_ExtendedC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_FixedDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/FixedDef:1.0",
-    "FixedDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_FixedDef =
-    &_tao_tc_CORBA_FixedDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ValueMember[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec },
-    { "type", &CORBA::_tc_TypeCode },
-    { "type_def", &CORBA::_tc_IDLType },
-    { "access", &CORBA::_tc_Visibility }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ValueMember (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/ValueMember:1.0",
-    "ValueMember",
-    _tao_fields_CORBA_ValueMember,
-    7);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ValueMember =
-    &_tao_tc_CORBA_ValueMember;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_ValueMemberSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ValueMemberSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ValueMemberSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_ValueMember,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ValueMemberSeq_0 =
-      &CORBA_ValueMemberSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ValueMemberSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ValueMemberSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ValueMemberSeq:1.0",
-    "ValueMemberSeq",
-    &TAO::TypeCode::tc_CORBA_ValueMemberSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ValueMemberSeq =
-    &_tao_tc_CORBA_ValueMemberSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ValueMemberDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ValueMemberDef:1.0",
-    "ValueMemberDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ValueMemberDef =
-    &_tao_tc_CORBA_ValueMemberDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ValueDef_FullValueDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "is_abstract", &CORBA::_tc_boolean },
-    { "is_custom", &CORBA::_tc_boolean },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec },
-    { "operations", &CORBA::_tc_OpDescriptionSeq },
-    { "attributes", &CORBA::_tc_AttrDescriptionSeq },
-    { "members", &CORBA::_tc_ValueMemberSeq },
-    { "initializers", &CORBA::_tc_InitializerSeq },
-    { "supported_interfaces", &CORBA::_tc_RepositoryIdSeq },
-    { "abstract_base_values", &CORBA::_tc_RepositoryIdSeq },
-    { "is_truncatable", &CORBA::_tc_boolean },
-    { "base_value", &CORBA::_tc_RepositoryId },
-    { "type", &CORBA::_tc_TypeCode }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ValueDef_FullValueDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/ValueDef/FullValueDescription:1.0",
-    "FullValueDescription",
-    _tao_fields_CORBA_ValueDef_FullValueDescription,
-    15);
-  
-::CORBA::TypeCode_ptr const CORBA::ValueDef::_tc_FullValueDescription =
-  &_tao_tc_CORBA_ValueDef_FullValueDescription;
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ValueDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ValueDef:1.0",
-    "ValueDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ValueDef =
-    &_tao_tc_CORBA_ValueDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ValueDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "is_abstract", &CORBA::_tc_boolean },
-    { "is_custom", &CORBA::_tc_boolean },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec },
-    { "supported_interfaces", &CORBA::_tc_RepositoryIdSeq },
-    { "abstract_base_values", &CORBA::_tc_RepositoryIdSeq },
-    { "is_truncatable", &CORBA::_tc_boolean },
-    { "base_value", &CORBA::_tc_RepositoryId }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ValueDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/ValueDescription:1.0",
-    "ValueDescription",
-    _tao_fields_CORBA_ValueDescription,
-    10);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ValueDescription =
-    &_tao_tc_CORBA_ValueDescription;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ExtValueDef_ExtFullValueDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "is_abstract", &CORBA::_tc_boolean },
-    { "is_custom", &CORBA::_tc_boolean },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec },
-    { "operations", &CORBA::_tc_OpDescriptionSeq },
-    { "attributes", &CORBA::_tc_ExtAttrDescriptionSeq },
-    { "members", &CORBA::_tc_ValueMemberSeq },
-    { "initializers", &CORBA::_tc_ExtInitializerSeq },
-    { "supported_interfaces", &CORBA::_tc_RepositoryIdSeq },
-    { "abstract_base_values", &CORBA::_tc_RepositoryIdSeq },
-    { "is_truncatable", &CORBA::_tc_boolean },
-    { "base_value", &CORBA::_tc_RepositoryId },
-    { "type", &CORBA::_tc_TypeCode }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ExtValueDef_ExtFullValueDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/ExtValueDef/ExtFullValueDescription:1.0",
-    "ExtFullValueDescription",
-    _tao_fields_CORBA_ExtValueDef_ExtFullValueDescription,
-    15);
-  
-::CORBA::TypeCode_ptr const CORBA::ExtValueDef::_tc_ExtFullValueDescription =
-  &_tao_tc_CORBA_ExtValueDef_ExtFullValueDescription;
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ExtValueDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ExtValueDef:1.0",
-    "ExtValueDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ExtValueDef =
-    &_tao_tc_CORBA_ExtValueDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ValueBoxDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ValueBoxDef:1.0",
-    "ValueBoxDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ValueBoxDef =
-    &_tao_tc_CORBA_ValueBoxDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::FixedDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::FixedDef_ptr _tao_elem
-  )
-{
-  CORBA::FixedDef_ptr _tao_objptr =
-    CORBA::FixedDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::FixedDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::FixedDef>::insert (
-      _tao_any,
-      CORBA::FixedDef::_tao_any_destructor,
-      CORBA::_tc_FixedDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::FixedDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::FixedDef>::extract (
-        _tao_any,
-        CORBA::FixedDef::_tao_any_destructor,
-        CORBA::_tc_FixedDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ValueMember &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ValueMember>::insert_copy (
-      _tao_any,
-      CORBA::ValueMember::_tao_any_destructor,
-      CORBA::_tc_ValueMember,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ValueMember *_tao_elem
-  )
-{
-  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).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ValueMember *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ValueMember *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ValueMember *&_tao_elem
-  )
-{
-  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
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ValueMemberSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ValueMemberSeq>::insert_copy (
-      _tao_any,
-      CORBA::ValueMemberSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ValueMemberSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ValueMemberSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ValueMemberSeq>::insert (
-      _tao_any,
-      CORBA::ValueMemberSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ValueMemberSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ValueMemberSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ValueMemberSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ValueMemberSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ValueMemberSeq>::extract (
-        _tao_any,
-        CORBA::ValueMemberSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ValueMemberSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ValueMemberDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ValueMemberDef_ptr _tao_elem
-  )
-{
-  CORBA::ValueMemberDef_ptr _tao_objptr =
-    CORBA::ValueMemberDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ValueMemberDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ValueMemberDef>::insert (
-      _tao_any,
-      CORBA::ValueMemberDef::_tao_any_destructor,
-      CORBA::_tc_ValueMemberDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ValueMemberDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ValueMemberDef>::extract (
-        _tao_any,
-        CORBA::ValueMemberDef::_tao_any_destructor,
-        CORBA::_tc_ValueMemberDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ValueDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ValueDef_ptr _tao_elem
-  )
-{
-  CORBA::ValueDef_ptr _tao_objptr =
-    CORBA::ValueDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ValueDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ValueDef>::insert (
-      _tao_any,
-      CORBA::ValueDef::_tao_any_destructor,
-      CORBA::_tc_ValueDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ValueDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ValueDef>::extract (
-        _tao_any,
-        CORBA::ValueDef::_tao_any_destructor,
-        CORBA::_tc_ValueDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ValueDef::FullValueDescription &_tao_elem
-  )
-{
-  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.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ValueDef::FullValueDescription *_tao_elem
-  )
-{
-  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).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ValueDef::FullValueDescription *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ValueDef::FullValueDescription *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ValueDef::FullValueDescription *&_tao_elem
-  )
-{
-  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
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ValueDescription &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ValueDescription>::insert_copy (
-      _tao_any,
-      CORBA::ValueDescription::_tao_any_destructor,
-      CORBA::_tc_ValueDescription,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ValueDescription *_tao_elem
-  )
-{
-  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).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ValueDescription *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ValueDescription *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ValueDescription *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ValueDescription>::extract (
-        _tao_any,
-        CORBA::ValueDescription::_tao_any_destructor,
-        CORBA::_tc_ValueDescription,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ExtValueDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// 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;
-}
-
-// 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
-    );
-}
-
-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_IDL - Generated from 
-// 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 >>= 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
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ValueBoxDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ValueBoxDef_ptr _tao_elem
-  )
-{
-  CORBA::ValueBoxDef_ptr _tao_objptr =
-    CORBA::ValueBoxDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ValueBoxDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ValueBoxDef>::insert (
-      _tao_any,
-      CORBA::ValueBoxDef::_tao_any_destructor,
-      CORBA::_tc_ValueBoxDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ValueBoxDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ValueBoxDef>::extract (
-        _tao_any,
-        CORBA::ValueBoxDef::_tao_any_destructor,
-        CORBA::_tc_ValueBoxDef,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/IFR_Client/IFR_ExtendedA.h b/TAO/tao/IFR_Client/IFR_ExtendedA.h
new file mode 100644
index 00000000000..818268f0507
--- /dev/null
+++ b/TAO/tao/IFR_Client/IFR_ExtendedA.h
@@ -0,0 +1,44 @@
+// -*- 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/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:390
+
+#ifndef _TAO_IDL_ORIG_IFR_EXTENDEDA_H_
+#define _TAO_IDL_ORIG_IFR_EXTENDEDA_H_
+
+#include /**/ "ace/pre.h"
+
+#include "tao/IFR_Client/IFR_ExtendedC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "ace/post.h"
+#endif /* ifndef */
+
diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp b/TAO/tao/IFR_Client/IFR_ExtendedC.cpp
index b4b2c709440..7299eae1cf5 100644
--- a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp
+++ b/TAO/tao/IFR_Client/IFR_ExtendedC.cpp
@@ -26,14 +26,28 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:293
 
 
 #include "IFR_ExtendedC.h"
 #include "tao/CDR.h"
-#include "tao/Exception_Data.h"
+#include "tao/IFR_Client/IFR_BasicC.h"
+#include "tao/AnyTypeCode/VisibilityA.h"
+#include "tao/AnyTypeCode/ValueModifierA.h"
+#include "tao/AnyTypeCode/orb_typesA.h"
 #include "tao/Invocation_Adapter.h"
 #include "tao/Object_T.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Sequence_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
+#include "tao/AnyTypeCode/Recursive_Type_TypeCode.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 #include "tao/Basic_Arguments.h"
 #include "tao/Object_Argument_T.h"
 #include "tao/Special_Basic_Arguments.h"
@@ -50,15 +64,18 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
 {
 
-#if !defined (_CORBA_IDLTYPE__ARG_TRAITS_CS_)
-#define _CORBA_IDLTYPE__ARG_TRAITS_CS_
-  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
+
+#if !defined (_CORBA_IDLTYPE__ARG_TRAITS_)
+#define _CORBA_IDLTYPE__ARG_TRAITS_
+
   template<>
   class  Arg_Traits<CORBA::IDLType>
     : public
@@ -66,35 +83,40 @@ namespace TAO
             CORBA::IDLType_ptr,
             CORBA::IDLType_var,
             CORBA::IDLType_out,
-            TAO::Objref_Traits<CORBA::IDLType>
+            TAO::Objref_Traits<CORBA::IDLType>,
+            TAO::Any_Insert_Policy_Stream <CORBA::IDLType_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
+
+#if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_)
+#define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_
 
-#if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_CS_)
-#define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_CS_
-  
   template<>
   class Arg_Traits<CORBA::InterfaceDefSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::InterfaceDefSeq,
             CORBA::InterfaceDefSeq_var,
-            CORBA::InterfaceDefSeq_out
+            CORBA::InterfaceDefSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::InterfaceDefSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_VALUEDEF__ARG_TRAITS_CS_)
-#define _CORBA_VALUEDEF__ARG_TRAITS_CS_
-  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
+
+#if !defined (_CORBA_VALUEDEF__ARG_TRAITS_)
+#define _CORBA_VALUEDEF__ARG_TRAITS_
+
   template<>
   class  Arg_Traits<CORBA::ValueDef>
     : public
@@ -102,83 +124,88 @@ namespace TAO
             CORBA::ValueDef_ptr,
             CORBA::ValueDef_var,
             CORBA::ValueDef_out,
-            TAO::Objref_Traits<CORBA::ValueDef>
+            TAO::Objref_Traits<CORBA::ValueDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ValueDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:751
+  // be\be_visitor_arg_traits.cpp:828
+
+#if !defined (_CORBA_VALUEDEF_FULLVALUEDESCRIPTION__ARG_TRAITS_)
+#define _CORBA_VALUEDEF_FULLVALUEDESCRIPTION__ARG_TRAITS_
 
-#if !defined (_CORBA_VALUEDEF_FULLVALUEDESCRIPTION__ARG_TRAITS_CS_)
-#define _CORBA_VALUEDEF_FULLVALUEDESCRIPTION__ARG_TRAITS_CS_
-  
   template<>
   class Arg_Traits<CORBA::ValueDef::FullValueDescription>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ValueDef::FullValueDescription,
             CORBA::ValueDef::FullValueDescription_var,
-            CORBA::ValueDef::FullValueDescription_out
+            CORBA::ValueDef::FullValueDescription_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ValueDef::FullValueDescription>
           >
   {
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
+
+#if !defined (_CORBA_INITIALIZERSEQ__ARG_TRAITS_)
+#define _CORBA_INITIALIZERSEQ__ARG_TRAITS_
 
-#if !defined (_CORBA_INITIALIZERSEQ__ARG_TRAITS_CS_)
-#define _CORBA_INITIALIZERSEQ__ARG_TRAITS_CS_
-  
   template<>
   class Arg_Traits<CORBA::InitializerSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::InitializerSeq,
             CORBA::InitializerSeq_var,
-            CORBA::InitializerSeq_out
+            CORBA::InitializerSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::InitializerSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
+
+#if !defined (_CORBA_VALUEDEFSEQ__ARG_TRAITS_)
+#define _CORBA_VALUEDEFSEQ__ARG_TRAITS_
 
-#if !defined (_CORBA_VALUEDEFSEQ__ARG_TRAITS_CS_)
-#define _CORBA_VALUEDEFSEQ__ARG_TRAITS_CS_
-  
   template<>
   class Arg_Traits<CORBA::ValueDefSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ValueDefSeq,
             CORBA::ValueDefSeq_var,
-            CORBA::ValueDefSeq_out
+            CORBA::ValueDefSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ValueDefSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:751
+  // be\be_visitor_arg_traits.cpp:828
+
+#if !defined (_CORBA_EXTVALUEDEF_EXTFULLVALUEDESCRIPTION__ARG_TRAITS_)
+#define _CORBA_EXTVALUEDEF_EXTFULLVALUEDESCRIPTION__ARG_TRAITS_
 
-#if !defined (_CORBA_EXTVALUEDEF_EXTFULLVALUEDESCRIPTION__ARG_TRAITS_CS_)
-#define _CORBA_EXTVALUEDEF_EXTFULLVALUEDESCRIPTION__ARG_TRAITS_CS_
-  
   template<>
   class Arg_Traits<CORBA::ExtValueDef::ExtFullValueDescription>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ExtValueDef::ExtFullValueDescription,
             CORBA::ExtValueDef::ExtFullValueDescription_var,
-            CORBA::ExtValueDef::ExtFullValueDescription_out
+            CORBA::ExtValueDef::ExtFullValueDescription_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ExtValueDef::ExtFullValueDescription>
           >
   {
   };
@@ -186,10 +213,10 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
 
-#if !defined (_CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_CS_)
-#define _CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_CS_
+#if !defined (_CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_)
+#define _CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_
   
   template<>
   class Arg_Traits<CORBA::ExtInitializerSeq>
@@ -197,7 +224,8 @@ namespace TAO
         Var_Size_Arg_Traits_T<
             CORBA::ExtInitializerSeq,
             CORBA::ExtInitializerSeq_var,
-            CORBA::ExtInitializerSeq_out
+            CORBA::ExtInitializerSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ExtInitializerSeq>
           >
   {
   };
@@ -205,10 +233,10 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
 
-#if !defined (_CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_CS_)
-#define _CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_CS_
+#if !defined (_CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_)
+#define _CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_
   
   template<>
   class Arg_Traits<CORBA::ExceptionDefSeq>
@@ -216,7 +244,8 @@ namespace TAO
         Var_Size_Arg_Traits_T<
             CORBA::ExceptionDefSeq,
             CORBA::ExceptionDefSeq_var,
-            CORBA::ExceptionDefSeq_out
+            CORBA::ExceptionDefSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ExceptionDefSeq>
           >
   {
   };
@@ -224,24 +253,28 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:709
+  // be\be_visitor_arg_traits.cpp:786
 
-#if !defined (_CORBA_ATTRIBUTEMODE__ARG_TRAITS_CS_)
-#define _CORBA_ATTRIBUTEMODE__ARG_TRAITS_CS_
+#if !defined (_CORBA_ATTRIBUTEMODE__ARG_TRAITS_)
+#define _CORBA_ATTRIBUTEMODE__ARG_TRAITS_
   
   template<>
   class Arg_Traits<CORBA::AttributeMode>
     : public
         Basic_Arg_Traits_T<
-            CORBA::AttributeMode
+            CORBA::AttributeMode,
+            TAO::Any_Insert_Policy_Stream <CORBA::AttributeMode>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_ATTRIBUTEDEF__ARG_TRAITS_CS_)
-#define _CORBA_ATTRIBUTEDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_ATTRIBUTEDEF__ARG_TRAITS_)
+#define _CORBA_ATTRIBUTEDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::AttributeDef>
@@ -250,15 +283,19 @@ namespace TAO
             CORBA::AttributeDef_ptr,
             CORBA::AttributeDef_var,
             CORBA::AttributeDef_out,
-            TAO::Objref_Traits<CORBA::AttributeDef>
+            TAO::Objref_Traits<CORBA::AttributeDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::AttributeDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_EXTATTRIBUTEDEF__ARG_TRAITS_CS_)
-#define _CORBA_EXTATTRIBUTEDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_EXTATTRIBUTEDEF__ARG_TRAITS_)
+#define _CORBA_EXTATTRIBUTEDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ExtAttributeDef>
@@ -267,7 +304,8 @@ namespace TAO
             CORBA::ExtAttributeDef_ptr,
             CORBA::ExtAttributeDef_var,
             CORBA::ExtAttributeDef_out,
-            TAO::Objref_Traits<CORBA::ExtAttributeDef>
+            TAO::Objref_Traits<CORBA::ExtAttributeDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ExtAttributeDef_ptr>
           >
   {
   };
@@ -275,16 +313,17 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:709
+  // be\be_visitor_arg_traits.cpp:786
 
-#if !defined (_CORBA_OPERATIONMODE__ARG_TRAITS_CS_)
-#define _CORBA_OPERATIONMODE__ARG_TRAITS_CS_
+#if !defined (_CORBA_OPERATIONMODE__ARG_TRAITS_)
+#define _CORBA_OPERATIONMODE__ARG_TRAITS_
   
   template<>
   class Arg_Traits<CORBA::OperationMode>
     : public
         Basic_Arg_Traits_T<
-            CORBA::OperationMode
+            CORBA::OperationMode,
+            TAO::Any_Insert_Policy_Stream <CORBA::OperationMode>
           >
   {
   };
@@ -292,10 +331,10 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
 
-#if !defined (_CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_CS_)
-#define _CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_CS_
+#if !defined (_CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_)
+#define _CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_
   
   template<>
   class Arg_Traits<CORBA::ParDescriptionSeq>
@@ -303,7 +342,8 @@ namespace TAO
         Var_Size_Arg_Traits_T<
             CORBA::ParDescriptionSeq,
             CORBA::ParDescriptionSeq_var,
-            CORBA::ParDescriptionSeq_out
+            CORBA::ParDescriptionSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ParDescriptionSeq>
           >
   {
   };
@@ -311,10 +351,10 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
 
-#if !defined (_CORBA_CONTEXTIDSEQ__ARG_TRAITS_CS_)
-#define _CORBA_CONTEXTIDSEQ__ARG_TRAITS_CS_
+#if !defined (_CORBA_CONTEXTIDSEQ__ARG_TRAITS_)
+#define _CORBA_CONTEXTIDSEQ__ARG_TRAITS_
   
   template<>
   class Arg_Traits<CORBA::ContextIdSeq>
@@ -322,15 +362,19 @@ namespace TAO
         Var_Size_Arg_Traits_T<
             CORBA::ContextIdSeq,
             CORBA::ContextIdSeq_var,
-            CORBA::ContextIdSeq_out
+            CORBA::ContextIdSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ContextIdSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_OPERATIONDEF__ARG_TRAITS_CS_)
-#define _CORBA_OPERATIONDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_OPERATIONDEF__ARG_TRAITS_)
+#define _CORBA_OPERATIONDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::OperationDef>
@@ -339,15 +383,19 @@ namespace TAO
             CORBA::OperationDef_ptr,
             CORBA::OperationDef_var,
             CORBA::OperationDef_out,
-            TAO::Objref_Traits<CORBA::OperationDef>
+            TAO::Objref_Traits<CORBA::OperationDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::OperationDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_VALUEMEMBERDEF__ARG_TRAITS_CS_)
-#define _CORBA_VALUEMEMBERDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_VALUEMEMBERDEF__ARG_TRAITS_)
+#define _CORBA_VALUEMEMBERDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ValueMemberDef>
@@ -356,7 +404,8 @@ namespace TAO
             CORBA::ValueMemberDef_ptr,
             CORBA::ValueMemberDef_var,
             CORBA::ValueMemberDef_out,
-            TAO::Objref_Traits<CORBA::ValueMemberDef>
+            TAO::Objref_Traits<CORBA::ValueMemberDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ValueMemberDef_ptr>
           >
   {
   };
@@ -700,6 +749,57 @@ CORBA::FixedDef::marshal (TAO_OutputCDR &cdr)
   return (cdr << this);
 }
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_FixedDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/FixedDef:1.0",
+    "FixedDef");
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_FixedDef =
+    &_tao_tc_CORBA_FixedDef;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ValueMember[] =
+  {
+    { "name", &CORBA::_tc_Identifier },
+    { "id", &CORBA::_tc_RepositoryId },
+    { "defined_in", &CORBA::_tc_RepositoryId },
+    { "version", &CORBA::_tc_VersionSpec },
+    { "type", &CORBA::_tc_TypeCode },
+    { "type_def", &CORBA::_tc_IDLType },
+    { "access", &CORBA::_tc_Visibility }
+    
+  };
+static TAO::TypeCode::Struct<char const *,
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ValueMember (
+    CORBA::tk_struct,
+    "IDL:omg.org/CORBA/ValueMember:1.0",
+    "ValueMember",
+    _tao_fields_CORBA_ValueMember,
+    7);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ValueMember =
+    &_tao_tc_CORBA_ValueMember;
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
@@ -726,7 +826,7 @@ CORBA::ValueMemberSeq::ValueMemberSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ValueMember
+        ValueMember
       >
     (max)
 {}
@@ -738,7 +838,7 @@ CORBA::ValueMemberSeq::ValueMemberSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ValueMember
+        ValueMember
       >
     (max, length, buffer, release)
 {}
@@ -747,7 +847,7 @@ CORBA::ValueMemberSeq::ValueMemberSeq (
     const ValueMemberSeq &seq
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ValueMember
+        ValueMember
       >
     (seq)
 {}
@@ -767,6 +867,54 @@ void CORBA::ValueMemberSeq::_tao_any_destructor (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+#ifndef _TAO_TYPECODE_CORBA_ValueMemberSeq_GUARD
+#define _TAO_TYPECODE_CORBA_ValueMemberSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_ValueMemberSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::_tc_ValueMember,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_CORBA_ValueMemberSeq_0 =
+      &CORBA_ValueMemberSeq_0;
+    
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_ValueMemberSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ValueMemberSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/ValueMemberSeq:1.0",
+    "ValueMemberSeq",
+    &TAO::TypeCode::tc_CORBA_ValueMemberSeq_0);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ValueMemberSeq =
+    &_tao_tc_CORBA_ValueMemberSeq;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::ValueMemberDef.
@@ -870,7 +1018,7 @@ CORBA::TypeCode_ptr CORBA::ValueMemberDef::type (
       CORBA_ValueMemberDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::IDLType>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::IDLType>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -914,7 +1062,7 @@ void CORBA::ValueMemberDef::type_def (
     }
   
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_type_def (type_def);
+  TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type_def (type_def);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1144,6 +1292,24 @@ CORBA::ValueMemberDef::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ValueMemberDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/ValueMemberDef:1.0",
+    "ValueMemberDef");
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ValueMemberDef =
+    &_tao_tc_CORBA_ValueMemberDef;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::ValueDef.
@@ -1205,7 +1371,7 @@ TAO::Collocation_Proxy_Broker *
       CORBA_ValueDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1249,7 +1415,7 @@ void CORBA::ValueDef::supported_interfaces (
     }
   
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces (supported_interfaces);
+  TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces (supported_interfaces);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1290,7 +1456,7 @@ void CORBA::ValueDef::supported_interfaces (
       CORBA_ValueDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::InitializerSeq>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::InitializerSeq>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1334,7 +1500,7 @@ void CORBA::ValueDef::initializers (
     }
   
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::InitializerSeq>::in_arg_val _tao_initializers (initializers);
+  TAO::Arg_Traits< ::CORBA::InitializerSeq>::in_arg_val _tao_initializers (initializers);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1375,7 +1541,7 @@ void CORBA::ValueDef::initializers (
       CORBA_ValueDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ValueDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::ValueDef>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1419,7 +1585,7 @@ void CORBA::ValueDef::base_value (
     }
   
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::ValueDef>::in_arg_val _tao_base_value (base_value);
+  TAO::Arg_Traits< ::CORBA::ValueDef>::in_arg_val _tao_base_value (base_value);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1460,7 +1626,7 @@ void CORBA::ValueDef::base_value (
       CORBA_ValueDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ValueDefSeq>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::ValueDefSeq>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1504,7 +1670,7 @@ void CORBA::ValueDef::abstract_base_values (
     }
   
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values (abstract_base_values);
+  TAO::Arg_Traits< ::CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values (abstract_base_values);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1802,7 +1968,7 @@ CORBA::Boolean CORBA::ValueDef::is_a (
     }
   
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1825,6 +1991,72 @@ CORBA::Boolean CORBA::ValueDef::is_a (
   return _tao_retval.retn ();
 }
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ValueDef_FullValueDescription[] =
+  {
+    { "name", &CORBA::_tc_Identifier },
+    { "id", &CORBA::_tc_RepositoryId },
+    { "is_abstract", &CORBA::_tc_boolean },
+    { "is_custom", &CORBA::_tc_boolean },
+    { "defined_in", &CORBA::_tc_RepositoryId },
+    { "version", &CORBA::_tc_VersionSpec },
+    { "operations", &CORBA::_tc_OpDescriptionSeq },
+    { "attributes", &CORBA::_tc_AttrDescriptionSeq },
+    { "members", &CORBA::_tc_ValueMemberSeq },
+    { "initializers", &CORBA::_tc_InitializerSeq },
+    { "supported_interfaces", &CORBA::_tc_RepositoryIdSeq },
+    { "abstract_base_values", &CORBA::_tc_RepositoryIdSeq },
+    { "is_truncatable", &CORBA::_tc_boolean },
+    { "base_value", &CORBA::_tc_RepositoryId },
+    { "type", &CORBA::_tc_TypeCode }
+    
+  };
+static TAO::TypeCode::Struct<char const *,
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ValueDef_FullValueDescription (
+    CORBA::tk_struct,
+    "IDL:omg.org/CORBA/ValueDef/FullValueDescription:1.0",
+    "FullValueDescription",
+    _tao_fields_CORBA_ValueDef_FullValueDescription,
+    15);
+  
+::CORBA::TypeCode_ptr const CORBA::ValueDef::_tc_FullValueDescription =
+  &_tao_tc_CORBA_ValueDef_FullValueDescription;
+
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
@@ -1858,7 +2090,7 @@ CORBA::ValueDef::FullValueDescription::_tao_any_destructor (
       CORBA_ValueDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ValueDef::FullValueDescription>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::ValueDef::FullValueDescription>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1905,11 +2137,11 @@ CORBA::ValueDef::FullValueDescription::_tao_any_destructor (
       CORBA_ValueDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ValueMemberDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_type (type);
+  TAO::Arg_Traits< ::CORBA::ValueMemberDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type (type);
   TAO::Arg_Traits< ::CORBA::Visibility>::in_arg_val _tao_access (access);
   
   TAO::Argument *_the_tao_operation_signature [] =
@@ -1962,12 +2194,12 @@ CORBA::ValueDef::FullValueDescription::_tao_any_destructor (
       CORBA_ValueDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::AttributeDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_type (type);
-  TAO::Arg_Traits< CORBA::AttributeMode>::in_arg_val _tao_mode (mode);
+  TAO::Arg_Traits< ::CORBA::AttributeDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type (type);
+  TAO::Arg_Traits< ::CORBA::AttributeMode>::in_arg_val _tao_mode (mode);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2022,15 +2254,15 @@ CORBA::ValueDef::FullValueDescription::_tao_any_destructor (
       CORBA_ValueDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::OperationDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_result (result);
-  TAO::Arg_Traits< CORBA::OperationMode>::in_arg_val _tao_mode (mode);
-  TAO::Arg_Traits< CORBA::ParDescriptionSeq>::in_arg_val _tao_params (params);
-  TAO::Arg_Traits< CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions (exceptions);
-  TAO::Arg_Traits< CORBA::ContextIdSeq>::in_arg_val _tao_contexts (contexts);
+  TAO::Arg_Traits< ::CORBA::OperationDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_result (result);
+  TAO::Arg_Traits< ::CORBA::OperationMode>::in_arg_val _tao_mode (mode);
+  TAO::Arg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_val _tao_params (params);
+  TAO::Arg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions (exceptions);
+  TAO::Arg_Traits< ::CORBA::ContextIdSeq>::in_arg_val _tao_contexts (contexts);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2193,6 +2425,70 @@ CORBA::ValueDef::marshal (TAO_OutputCDR &cdr)
   return (cdr << this);
 }
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ValueDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/ValueDef:1.0",
+    "ValueDef");
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ValueDef =
+    &_tao_tc_CORBA_ValueDef;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ValueDescription[] =
+  {
+    { "name", &CORBA::_tc_Identifier },
+    { "id", &CORBA::_tc_RepositoryId },
+    { "is_abstract", &CORBA::_tc_boolean },
+    { "is_custom", &CORBA::_tc_boolean },
+    { "defined_in", &CORBA::_tc_RepositoryId },
+    { "version", &CORBA::_tc_VersionSpec },
+    { "supported_interfaces", &CORBA::_tc_RepositoryIdSeq },
+    { "abstract_base_values", &CORBA::_tc_RepositoryIdSeq },
+    { "is_truncatable", &CORBA::_tc_boolean },
+    { "base_value", &CORBA::_tc_RepositoryId }
+    
+  };
+static TAO::TypeCode::Struct<char const *,
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ValueDescription (
+    CORBA::tk_struct,
+    "IDL:omg.org/CORBA/ValueDescription:1.0",
+    "ValueDescription",
+    _tao_fields_CORBA_ValueDescription,
+    10);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ValueDescription =
+    &_tao_tc_CORBA_ValueDescription;
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
@@ -2268,7 +2564,7 @@ TAO::Collocation_Proxy_Broker *
       CORBA_ExtValueDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ExtInitializerSeq>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::ExtInitializerSeq>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2312,7 +2608,7 @@ void CORBA::ExtValueDef::ext_initializers (
     }
   
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::ExtInitializerSeq>::in_arg_val _tao_ext_initializers (ext_initializers);
+  TAO::Arg_Traits< ::CORBA::ExtInitializerSeq>::in_arg_val _tao_ext_initializers (ext_initializers);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2333,6 +2629,72 @@ void CORBA::ExtValueDef::ext_initializers (
   ACE_CHECK;
 }
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ExtValueDef_ExtFullValueDescription[] =
+  {
+    { "name", &CORBA::_tc_Identifier },
+    { "id", &CORBA::_tc_RepositoryId },
+    { "is_abstract", &CORBA::_tc_boolean },
+    { "is_custom", &CORBA::_tc_boolean },
+    { "defined_in", &CORBA::_tc_RepositoryId },
+    { "version", &CORBA::_tc_VersionSpec },
+    { "operations", &CORBA::_tc_OpDescriptionSeq },
+    { "attributes", &CORBA::_tc_ExtAttrDescriptionSeq },
+    { "members", &CORBA::_tc_ValueMemberSeq },
+    { "initializers", &CORBA::_tc_ExtInitializerSeq },
+    { "supported_interfaces", &CORBA::_tc_RepositoryIdSeq },
+    { "abstract_base_values", &CORBA::_tc_RepositoryIdSeq },
+    { "is_truncatable", &CORBA::_tc_boolean },
+    { "base_value", &CORBA::_tc_RepositoryId },
+    { "type", &CORBA::_tc_TypeCode }
+    
+  };
+static TAO::TypeCode::Struct<char const *,
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ExtValueDef_ExtFullValueDescription (
+    CORBA::tk_struct,
+    "IDL:omg.org/CORBA/ExtValueDef/ExtFullValueDescription:1.0",
+    "ExtFullValueDescription",
+    _tao_fields_CORBA_ExtValueDef_ExtFullValueDescription,
+    15);
+  
+::CORBA::TypeCode_ptr const CORBA::ExtValueDef::_tc_ExtFullValueDescription =
+  &_tao_tc_CORBA_ExtValueDef_ExtFullValueDescription;
+
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
@@ -2366,7 +2728,7 @@ CORBA::ExtValueDef::ExtFullValueDescription::_tao_any_destructor (
       CORBA_ExtValueDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ExtValueDef::ExtFullValueDescription>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::ExtValueDef::ExtFullValueDescription>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2415,14 +2777,14 @@ CORBA::ExtValueDef::ExtFullValueDescription::_tao_any_destructor (
       CORBA_ExtValueDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ExtAttributeDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_type (type);
-  TAO::Arg_Traits< CORBA::AttributeMode>::in_arg_val _tao_mode (mode);
-  TAO::Arg_Traits< CORBA::ExceptionDefSeq>::in_arg_val _tao_get_exceptions (get_exceptions);
-  TAO::Arg_Traits< CORBA::ExceptionDefSeq>::in_arg_val _tao_set_exceptions (set_exceptions);
+  TAO::Arg_Traits< ::CORBA::ExtAttributeDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type (type);
+  TAO::Arg_Traits< ::CORBA::AttributeMode>::in_arg_val _tao_mode (mode);
+  TAO::Arg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_get_exceptions (get_exceptions);
+  TAO::Arg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_set_exceptions (set_exceptions);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2587,6 +2949,24 @@ CORBA::ExtValueDef::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ExtValueDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/ExtValueDef:1.0",
+    "ExtValueDef");
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ExtValueDef =
+    &_tao_tc_CORBA_ExtValueDef;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::ValueBoxDef.
@@ -2648,7 +3028,7 @@ TAO::Collocation_Proxy_Broker *
       CORBA_ValueBoxDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::IDLType>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::IDLType>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2692,7 +3072,7 @@ void CORBA::ValueBoxDef::original_type_def (
     }
   
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_original_type_def (original_type_def);
+  TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_original_type_def (original_type_def);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2845,6 +3225,605 @@ CORBA::ValueBoxDef::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ValueBoxDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/ValueBoxDef:1.0",
+    "ValueBoxDef");
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ValueBoxDef =
+    &_tao_tc_CORBA_ValueBoxDef;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::FixedDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::FixedDef_ptr _tao_elem
+  )
+{
+  CORBA::FixedDef_ptr _tao_objptr =
+    CORBA::FixedDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::FixedDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::FixedDef>::insert (
+      _tao_any,
+      CORBA::FixedDef::_tao_any_destructor,
+      CORBA::_tc_FixedDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::FixedDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::FixedDef>::extract (
+        _tao_any,
+        CORBA::FixedDef::_tao_any_destructor,
+        CORBA::_tc_FixedDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ValueMember &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ValueMember>::insert_copy (
+      _tao_any,
+      CORBA::ValueMember::_tao_any_destructor,
+      CORBA::_tc_ValueMember,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ValueMember *_tao_elem
+  )
+{
+  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).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ValueMember *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::ValueMember *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ValueMember *&_tao_elem
+  )
+{
+  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
+
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ValueMemberSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ValueMemberSeq>::insert_copy (
+      _tao_any,
+      CORBA::ValueMemberSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ValueMemberSeq_0,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ValueMemberSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ValueMemberSeq>::insert (
+      _tao_any,
+      CORBA::ValueMemberSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ValueMemberSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ValueMemberSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::ValueMemberSeq *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ValueMemberSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ValueMemberSeq>::extract (
+        _tao_any,
+        CORBA::ValueMemberSeq::_tao_any_destructor,
+        TAO::TypeCode::tc_CORBA_ValueMemberSeq_0,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::ValueMemberDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ValueMemberDef_ptr _tao_elem
+  )
+{
+  CORBA::ValueMemberDef_ptr _tao_objptr =
+    CORBA::ValueMemberDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ValueMemberDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::ValueMemberDef>::insert (
+      _tao_any,
+      CORBA::ValueMemberDef::_tao_any_destructor,
+      CORBA::_tc_ValueMemberDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ValueMemberDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::ValueMemberDef>::extract (
+        _tao_any,
+        CORBA::ValueMemberDef::_tao_any_destructor,
+        CORBA::_tc_ValueMemberDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::ValueDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ValueDef_ptr _tao_elem
+  )
+{
+  CORBA::ValueDef_ptr _tao_objptr =
+    CORBA::ValueDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ValueDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::ValueDef>::insert (
+      _tao_any,
+      CORBA::ValueDef::_tao_any_destructor,
+      CORBA::_tc_ValueDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ValueDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::ValueDef>::extract (
+        _tao_any,
+        CORBA::ValueDef::_tao_any_destructor,
+        CORBA::_tc_ValueDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ValueDef::FullValueDescription &_tao_elem
+  )
+{
+  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.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ValueDef::FullValueDescription *_tao_elem
+  )
+{
+  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).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ValueDef::FullValueDescription *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::ValueDef::FullValueDescription *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ValueDef::FullValueDescription *&_tao_elem
+  )
+{
+  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
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ValueDescription &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ValueDescription>::insert_copy (
+      _tao_any,
+      CORBA::ValueDescription::_tao_any_destructor,
+      CORBA::_tc_ValueDescription,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ValueDescription *_tao_elem
+  )
+{
+  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).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ValueDescription *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::ValueDescription *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ValueDescription *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ValueDescription>::extract (
+        _tao_any,
+        CORBA::ValueDescription::_tao_any_destructor,
+        CORBA::_tc_ValueDescription,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::ExtValueDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// 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;
+}
+
+// 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
+    );
+}
+
+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_IDL - Generated from 
+// 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 >>= 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
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::ValueBoxDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ValueBoxDef_ptr _tao_elem
+  )
+{
+  CORBA::ValueBoxDef_ptr _tao_objptr =
+    CORBA::ValueBoxDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ValueBoxDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::ValueBoxDef>::insert (
+      _tao_any,
+      CORBA::ValueBoxDef::_tao_any_destructor,
+      CORBA::_tc_ValueBoxDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ValueBoxDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::ValueBoxDef>::extract (
+        _tao_any,
+        CORBA::ValueBoxDef::_tao_any_destructor,
+        CORBA::_tc_ValueBoxDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
@@ -3035,8 +4014,8 @@ CORBA::Boolean operator<< (
   return
     (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 << ACE_OutputCDR::from_boolean (_tao_aggregate.is_abstract)) &&
+    (strm << ACE_OutputCDR::from_boolean (_tao_aggregate.is_custom)) &&
     (strm << _tao_aggregate.defined_in.in ()) &&
     (strm << _tao_aggregate.version.in ()) &&
     (strm << _tao_aggregate.operations) &&
@@ -3045,7 +4024,7 @@ CORBA::Boolean operator<< (
     (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 << ACE_OutputCDR::from_boolean (_tao_aggregate.is_truncatable)) &&
     (strm << _tao_aggregate.base_value.in ()) &&
     (strm << _tao_aggregate.type.in ());
 }
@@ -3058,8 +4037,8 @@ CORBA::Boolean operator>> (
   return
     (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 >> ACE_InputCDR::to_boolean (_tao_aggregate.is_abstract)) &&
+    (strm >> ACE_InputCDR::to_boolean (_tao_aggregate.is_custom)) &&
     (strm >> _tao_aggregate.defined_in.out ()) &&
     (strm >> _tao_aggregate.version.out ()) &&
     (strm >> _tao_aggregate.operations) &&
@@ -3068,7 +4047,7 @@ CORBA::Boolean operator>> (
     (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 >> ACE_InputCDR::to_boolean (_tao_aggregate.is_truncatable)) &&
     (strm >> _tao_aggregate.base_value.out ()) &&
     (strm >> _tao_aggregate.type.out ());
 }
@@ -3120,13 +4099,13 @@ CORBA::Boolean operator<< (
   return
     (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 << ACE_OutputCDR::from_boolean (_tao_aggregate.is_abstract)) &&
+    (strm << ACE_OutputCDR::from_boolean (_tao_aggregate.is_custom)) &&
     (strm << _tao_aggregate.defined_in.in ()) &&
     (strm << _tao_aggregate.version.in ()) &&
     (strm << _tao_aggregate.supported_interfaces) &&
     (strm << _tao_aggregate.abstract_base_values) &&
-    (strm << CORBA::Any::from_boolean (_tao_aggregate.is_truncatable)) &&
+    (strm << ACE_OutputCDR::from_boolean (_tao_aggregate.is_truncatable)) &&
     (strm << _tao_aggregate.base_value.in ());
 }
 
@@ -3138,13 +4117,13 @@ CORBA::Boolean operator>> (
   return
     (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 >> ACE_InputCDR::to_boolean (_tao_aggregate.is_abstract)) &&
+    (strm >> ACE_InputCDR::to_boolean (_tao_aggregate.is_custom)) &&
     (strm >> _tao_aggregate.defined_in.out ()) &&
     (strm >> _tao_aggregate.version.out ()) &&
     (strm >> _tao_aggregate.supported_interfaces) &&
     (strm >> _tao_aggregate.abstract_base_values) &&
-    (strm >> CORBA::Any::to_boolean (_tao_aggregate.is_truncatable)) &&
+    (strm >> ACE_InputCDR::to_boolean (_tao_aggregate.is_truncatable)) &&
     (strm >> _tao_aggregate.base_value.out ());
 }
 
@@ -3159,8 +4138,8 @@ CORBA::Boolean operator<< (
   return
     (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 << ACE_OutputCDR::from_boolean (_tao_aggregate.is_abstract)) &&
+    (strm << ACE_OutputCDR::from_boolean (_tao_aggregate.is_custom)) &&
     (strm << _tao_aggregate.defined_in.in ()) &&
     (strm << _tao_aggregate.version.in ()) &&
     (strm << _tao_aggregate.operations) &&
@@ -3169,7 +4148,7 @@ CORBA::Boolean operator<< (
     (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 << ACE_OutputCDR::from_boolean (_tao_aggregate.is_truncatable)) &&
     (strm << _tao_aggregate.base_value.in ()) &&
     (strm << _tao_aggregate.type.in ());
 }
@@ -3182,8 +4161,8 @@ CORBA::Boolean operator>> (
   return
     (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 >> ACE_InputCDR::to_boolean (_tao_aggregate.is_abstract)) &&
+    (strm >> ACE_InputCDR::to_boolean (_tao_aggregate.is_custom)) &&
     (strm >> _tao_aggregate.defined_in.out ()) &&
     (strm >> _tao_aggregate.version.out ()) &&
     (strm >> _tao_aggregate.operations) &&
@@ -3192,7 +4171,7 @@ CORBA::Boolean operator>> (
     (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 >> ACE_InputCDR::to_boolean (_tao_aggregate.is_truncatable)) &&
     (strm >> _tao_aggregate.base_value.out ()) &&
     (strm >> _tao_aggregate.type.out ());
 }
diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.h b/TAO/tao/IFR_Client/IFR_ExtendedC.h
index b62da63b595..281a37c13e7 100644
--- a/TAO/tao/IFR_Client/IFR_ExtendedC.h
+++ b/TAO/tao/IFR_Client/IFR_ExtendedC.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
 #ifndef _TAO_IDL_ORIG_IFR_EXTENDEDC_H_
 #define _TAO_IDL_ORIG_IFR_EXTENDEDC_H_
@@ -45,8 +45,8 @@
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
-#include "tao/TypeCode.h"
-#include "tao/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/Sequence_T.h"
 #include "tao/Objref_VarOut_T.h"
 #include "tao/Seq_Var_T.h"
@@ -54,8 +54,8 @@
 #include "tao/VarOut_T.h"
 
 #include "tao/IFR_Client/IFR_BasicC.h"
-#include "tao/VisibilityC.h"
-#include "tao/ValueModifierC.h"
+#include "tao/AnyTypeCode/VisibilityC.h"
+#include "tao/AnyTypeCode/ValueModifierC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -234,7 +234,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_FixedDef;
   
@@ -257,7 +257,7 @@ namespace CORBA
     ValueMember_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
+  // be\be_visitor_structure/structure_ch.cpp:57
   
   struct TAO_IFR_Client_Export ValueMember
   {
@@ -274,7 +274,7 @@ namespace CORBA
   };
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ValueMember;
   
@@ -327,7 +327,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ValueMemberSeq;
   
@@ -489,7 +489,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ValueMemberDef;
   
@@ -731,7 +731,7 @@ namespace CORBA
       FullValueDescription_out;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_structure/structure_ch.cpp:52
+    // be\be_visitor_structure/structure_ch.cpp:57
     
     struct TAO_IFR_Client_Export FullValueDescription
     {
@@ -756,7 +756,7 @@ namespace CORBA
     };
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     static ::CORBA::TypeCode_ptr const _tc_FullValueDescription;
     
@@ -865,7 +865,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ValueDef;
   
@@ -888,7 +888,7 @@ namespace CORBA
     ValueDescription_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
+  // be\be_visitor_structure/structure_ch.cpp:57
   
   struct TAO_IFR_Client_Export ValueDescription
   {
@@ -908,7 +908,7 @@ namespace CORBA
   };
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ValueDescription;
   
@@ -1011,7 +1011,7 @@ namespace CORBA
       ExtFullValueDescription_out;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_structure/structure_ch.cpp:52
+    // be\be_visitor_structure/structure_ch.cpp:57
     
     struct TAO_IFR_Client_Export ExtFullValueDescription
     {
@@ -1036,7 +1036,7 @@ namespace CORBA
     };
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     static ::CORBA::TypeCode_ptr const _tc_ExtFullValueDescription;
     
@@ -1114,7 +1114,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExtValueDef;
   
@@ -1245,7 +1245,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ValueBoxDef;
 
@@ -1296,105 +1296,105 @@ TAO::Collocation_Proxy_Broker *
 namespace TAO
 {
 
-#if !defined (_CORBA_VALUEDEF__TRAITS_CH_)
-#define _CORBA_VALUEDEF__TRAITS_CH_
+#if !defined (_CORBA_FIXEDDEF__TRAITS_)
+#define _CORBA_FIXEDDEF__TRAITS_
   
   template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ValueDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::FixedDef>
   {
-    static ::CORBA::ValueDef_ptr duplicate (
-        ::CORBA::ValueDef_ptr
+    static ::CORBA::FixedDef_ptr duplicate (
+        ::CORBA::FixedDef_ptr
       );
     static void release (
-        ::CORBA::ValueDef_ptr
+        ::CORBA::FixedDef_ptr
       );
-    static ::CORBA::ValueDef_ptr nil (void);
+    static ::CORBA::FixedDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::ValueDef_ptr p,
+        ::CORBA::FixedDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_VALUEBOXDEF__TRAITS_CH_)
-#define _CORBA_VALUEBOXDEF__TRAITS_CH_
+#if !defined (_CORBA_VALUEMEMBERDEF__TRAITS_)
+#define _CORBA_VALUEMEMBERDEF__TRAITS_
   
   template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ValueBoxDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ValueMemberDef>
   {
-    static ::CORBA::ValueBoxDef_ptr duplicate (
-        ::CORBA::ValueBoxDef_ptr
+    static ::CORBA::ValueMemberDef_ptr duplicate (
+        ::CORBA::ValueMemberDef_ptr
       );
     static void release (
-        ::CORBA::ValueBoxDef_ptr
+        ::CORBA::ValueMemberDef_ptr
       );
-    static ::CORBA::ValueBoxDef_ptr nil (void);
+    static ::CORBA::ValueMemberDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::ValueBoxDef_ptr p,
+        ::CORBA::ValueMemberDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_EXTVALUEDEF__TRAITS_CH_)
-#define _CORBA_EXTVALUEDEF__TRAITS_CH_
+#if !defined (_CORBA_VALUEDEF__TRAITS_)
+#define _CORBA_VALUEDEF__TRAITS_
   
   template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExtValueDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ValueDef>
   {
-    static ::CORBA::ExtValueDef_ptr duplicate (
-        ::CORBA::ExtValueDef_ptr
+    static ::CORBA::ValueDef_ptr duplicate (
+        ::CORBA::ValueDef_ptr
       );
     static void release (
-        ::CORBA::ExtValueDef_ptr
+        ::CORBA::ValueDef_ptr
       );
-    static ::CORBA::ExtValueDef_ptr nil (void);
+    static ::CORBA::ValueDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::ExtValueDef_ptr p,
+        ::CORBA::ValueDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_FIXEDDEF__TRAITS_CH_)
-#define _CORBA_FIXEDDEF__TRAITS_CH_
+#if !defined (_CORBA_EXTVALUEDEF__TRAITS_)
+#define _CORBA_EXTVALUEDEF__TRAITS_
   
   template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::FixedDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExtValueDef>
   {
-    static ::CORBA::FixedDef_ptr duplicate (
-        ::CORBA::FixedDef_ptr
+    static ::CORBA::ExtValueDef_ptr duplicate (
+        ::CORBA::ExtValueDef_ptr
       );
     static void release (
-        ::CORBA::FixedDef_ptr
+        ::CORBA::ExtValueDef_ptr
       );
-    static ::CORBA::FixedDef_ptr nil (void);
+    static ::CORBA::ExtValueDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::FixedDef_ptr p,
+        ::CORBA::ExtValueDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_VALUEMEMBERDEF__TRAITS_CH_)
-#define _CORBA_VALUEMEMBERDEF__TRAITS_CH_
+#if !defined (_CORBA_VALUEBOXDEF__TRAITS_)
+#define _CORBA_VALUEBOXDEF__TRAITS_
   
   template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ValueMemberDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ValueBoxDef>
   {
-    static ::CORBA::ValueMemberDef_ptr duplicate (
-        ::CORBA::ValueMemberDef_ptr
+    static ::CORBA::ValueBoxDef_ptr duplicate (
+        ::CORBA::ValueBoxDef_ptr
       );
     static void release (
-        ::CORBA::ValueMemberDef_ptr
+        ::CORBA::ValueBoxDef_ptr
       );
-    static ::CORBA::ValueMemberDef_ptr nil (void);
+    static ::CORBA::ValueBoxDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::ValueMemberDef_ptr p,
+        ::CORBA::ValueBoxDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -1403,14 +1403,14 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 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
+// be\be_visitor_structure/any_op_ch.cpp:53
 
 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
@@ -1418,7 +1418,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
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 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
@@ -1426,21 +1426,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
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 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
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 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
+// be\be_visitor_structure/any_op_ch.cpp:53
 
 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
@@ -1448,7 +1448,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
+// be\be_visitor_structure/any_op_ch.cpp:53
 
 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
@@ -1456,14 +1456,14 @@ 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
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 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
-// be\be_visitor_structure/any_op_ch.cpp:52
+// be\be_visitor_structure/any_op_ch.cpp:53
 
 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
@@ -1471,7 +1471,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Ext
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ExtValueDef::ExtFullValueDescription *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 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
@@ -1549,7 +1549,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::V
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ValueBoxDef_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
+// be\be_codegen.cpp:1136
 
 #if defined (__ACE_INLINE__)
 #include "IFR_ExtendedC.inl"
diff --git a/TAO/tao/IFR_Client_Adapter.h b/TAO/tao/IFR_Client_Adapter.h
index 9e8afc3e10f..1d3240b853e 100644
--- a/TAO/tao/IFR_Client_Adapter.h
+++ b/TAO/tao/IFR_Client_Adapter.h
@@ -34,8 +34,6 @@ namespace CORBA
   class InterfaceDef;
   typedef InterfaceDef *InterfaceDef_ptr;
 
-  class Any;
-
   class ORB;
   typedef ORB *ORB_ptr;
 
@@ -69,7 +67,7 @@ public:
     ) = 0;
 
   virtual void interfacedef_any_insert (
-      CORBA::Any &any,
+      CORBA::Any *any,
       CORBA::InterfaceDef_ptr object_type
     ) = 0;
 
diff --git a/TAO/tao/IIOP.pidl b/TAO/tao/IIOP.pidl
index 4fa9e7da509..cd52af48f60 100644
--- a/TAO/tao/IIOP.pidl
+++ b/TAO/tao/IIOP.pidl
@@ -2,21 +2,23 @@
 //
 // $Id$
 
-//
-//   This file was used to generate the code in
-//   IIOP*.* The command used to generate code
-//   is:
-//
-//     tao_idl \
-//        -o orig -Gp -Gd -Ge 1 -GA -Sc -Sci
-//          -Wb,export_macro=TAO_Export \
-//          -Wb,export_include="tao/TAO_Export.h" \
-//          -Wb,pre_include="ace/pre.h" \
-//          -Wb,post_include="ace/post.h" \
-//          IIOP.pidl
-//
-//   Remember to patch the generated files using diff/IIOP.diff
-//   This is from the GIOP 1.2 spec for Bi Dir IIOP.
+/**
+ *
+ *   This file was used to generate the code in
+ *   IIOP*.* The command used to generate code
+ *   is:
+ *
+ *     tao_idl \
+ *        -o orig -Gp -Gd -Ge 1 -GA -Sc -Sci
+ *          -Wb,export_macro=TAO_Export \
+ *          -Wb,export_include="tao/TAO_Export.h" \
+ *          -Wb,pre_include="ace/pre.h" \
+ *          -Wb,post_include="ace/post.h" \
+ *          IIOP.pidl
+ *
+ *   Remember to patch the generated files using diff/IIOP.diff
+ *   This is from the GIOP 1.2 spec for Bi Dir IIOP.
+ */
 
 #ifndef TAO_IIOP_PIDL
 #define TAO_IIOP_PIDL
diff --git a/TAO/tao/IIOPA.cpp b/TAO/tao/IIOPA.cpp
deleted file mode 100644
index 3915ddc3c03..00000000000
--- a/TAO/tao/IIOPA.cpp
+++ /dev/null
@@ -1,322 +0,0 @@
-// -*- 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/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "IIOPC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/Recursive_Type_TypeCode.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_IIOP_ListenPoint[] =
-  {
-    { "host", &CORBA::_tc_string },
-    { "port", &CORBA::_tc_ushort }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_IIOP_ListenPoint (
-    CORBA::tk_struct,
-    "IDL:omg.org/IIOP/ListenPoint:1.0",
-    "ListenPoint",
-    _tao_fields_IIOP_ListenPoint,
-    2);
-  
-namespace IIOP
-{
-  ::CORBA::TypeCode_ptr const _tc_ListenPoint =
-    &_tao_tc_IIOP_ListenPoint;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_IIOP_ListenPointList_GUARD
-#define _TAO_TYPECODE_IIOP_ListenPointList_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      IIOP_ListenPointList_0 (
-        CORBA::tk_sequence,
-        &IIOP::_tc_ListenPoint,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_IIOP_ListenPointList_0 =
-      &IIOP_ListenPointList_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_IIOP_ListenPointList_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_IIOP_ListenPointList (
-    CORBA::tk_alias,
-    "IDL:omg.org/IIOP/ListenPointList:1.0",
-    "ListenPointList",
-    &TAO::TypeCode::tc_IIOP_ListenPointList_0);
-  
-namespace IIOP
-{
-  ::CORBA::TypeCode_ptr const _tc_ListenPointList =
-    &_tao_tc_IIOP_ListenPointList;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_IIOP_BiDirIIOPServiceContext[] =
-  {
-    { "listen_points", &IIOP::_tc_ListenPointList }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_IIOP_BiDirIIOPServiceContext (
-    CORBA::tk_struct,
-    "IDL:omg.org/IIOP/BiDirIIOPServiceContext:1.0",
-    "BiDirIIOPServiceContext",
-    _tao_fields_IIOP_BiDirIIOPServiceContext,
-    1);
-  
-namespace IIOP
-{
-  ::CORBA::TypeCode_ptr const _tc_BiDirIIOPServiceContext =
-    &_tao_tc_IIOP_BiDirIIOPServiceContext;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const IIOP::ListenPoint &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IIOP::ListenPoint>::insert_copy (
-      _tao_any,
-      IIOP::ListenPoint::_tao_any_destructor,
-      IIOP::_tc_ListenPoint,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    IIOP::ListenPoint *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IIOP::ListenPoint>::insert (
-      _tao_any,
-      IIOP::ListenPoint::_tao_any_destructor,
-      IIOP::_tc_ListenPoint,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    IIOP::ListenPoint *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const IIOP::ListenPoint *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IIOP::ListenPoint *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<IIOP::ListenPoint>::extract (
-        _tao_any,
-        IIOP::ListenPoint::_tao_any_destructor,
-        IIOP::_tc_ListenPoint,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const IIOP::ListenPointList &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IIOP::ListenPointList>::insert_copy (
-      _tao_any,
-      IIOP::ListenPointList::_tao_any_destructor,
-      TAO::TypeCode::tc_IIOP_ListenPointList_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    IIOP::ListenPointList *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IIOP::ListenPointList>::insert (
-      _tao_any,
-      IIOP::ListenPointList::_tao_any_destructor,
-      TAO::TypeCode::tc_IIOP_ListenPointList_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    IIOP::ListenPointList *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const IIOP::ListenPointList *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IIOP::ListenPointList *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<IIOP::ListenPointList>::extract (
-        _tao_any,
-        IIOP::ListenPointList::_tao_any_destructor,
-        TAO::TypeCode::tc_IIOP_ListenPointList_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const IIOP::BiDirIIOPServiceContext &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IIOP::BiDirIIOPServiceContext>::insert_copy (
-      _tao_any,
-      IIOP::BiDirIIOPServiceContext::_tao_any_destructor,
-      IIOP::_tc_BiDirIIOPServiceContext,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    IIOP::BiDirIIOPServiceContext *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IIOP::BiDirIIOPServiceContext>::insert (
-      _tao_any,
-      IIOP::BiDirIIOPServiceContext::_tao_any_destructor,
-      IIOP::_tc_BiDirIIOPServiceContext,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    IIOP::BiDirIIOPServiceContext *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const IIOP::BiDirIIOPServiceContext *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IIOP::BiDirIIOPServiceContext *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<IIOP::BiDirIIOPServiceContext>::extract (
-        _tao_any,
-        IIOP::BiDirIIOPServiceContext::_tao_any_destructor,
-        IIOP::_tc_BiDirIIOPServiceContext,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/IIOPC.cpp b/TAO/tao/IIOPC.cpp
index b0ef17be4e1..6bb33006503 100644
--- a/TAO/tao/IIOPC.cpp
+++ b/TAO/tao/IIOPC.cpp
@@ -26,16 +26,12 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:288
 
 
 #include "IIOPC.h"
 #include "tao/CDR.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
@@ -71,7 +67,7 @@ IIOP::ListenPointList::ListenPointList (
     CORBA::ULong max
   )
   : TAO_Unbounded_Sequence<
-        IIOP::ListenPoint
+        ListenPoint
       >
     (max)
 {}
@@ -83,7 +79,7 @@ IIOP::ListenPointList::ListenPointList (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Sequence<
-        IIOP::ListenPoint
+        ListenPoint
       >
     (max, length, buffer, release)
 {}
@@ -92,7 +88,7 @@ IIOP::ListenPointList::ListenPointList (
     const ListenPointList &seq
   )
   : TAO_Unbounded_Sequence<
-        IIOP::ListenPoint
+        ListenPoint
       >
     (seq)
 {}
diff --git a/TAO/tao/IIOPC.h b/TAO/tao/IIOPC.h
index 332e5cd56dd..18133b7e39a 100644
--- a/TAO/tao/IIOPC.h
+++ b/TAO/tao/IIOPC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_IIOPC_H_
-#define _TAO_IDL_ORIG_IIOPC_H_
+#ifndef _TAO_IDL_IIOPC_H_
+#define _TAO_IDL_IIOPC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -58,12 +58,8 @@
 #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
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace IIOP
 {
@@ -87,7 +83,7 @@ namespace IIOP
     ListenPoint_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
+  // be\be_visitor_structure/structure_ch.cpp:57
   
   struct TAO_Export ListenPoint
   {
@@ -99,11 +95,6 @@ namespace IIOP
   };
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ListenPoint;
-  
-  // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_IIOP_LISTENPOINTLIST_CH_)
@@ -152,11 +143,6 @@ namespace IIOP
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ListenPointList;
-  
-  // TAO_IDL - Generated from
   // be\be_type.cpp:258
   
   struct BiDirIIOPServiceContext;
@@ -175,7 +161,7 @@ namespace IIOP
     BiDirIIOPServiceContext_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
+  // be\be_visitor_structure/structure_ch.cpp:57
   
   struct TAO_Export BiDirIIOPServiceContext
   {
@@ -184,14 +170,9 @@ namespace IIOP
     static void _tao_any_destructor (void *);
     IIOP::ListenPointList listen_points;
   };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_BiDirIIOPServiceContext;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module IIOP
 
@@ -204,30 +185,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// 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
-// 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
-// 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
 // be\be_visitor_structure/cdr_op_ch.cpp:54
 
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IIOP::ListenPoint &);
@@ -257,16 +214,12 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IIOP::BiDirIIOPServ
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IIOP::BiDirIIOPServiceContext &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
+// be\be_codegen.cpp:1062
 
 #if defined(_MSC_VER)
 #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/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp
index 4e4e0cf7fa9..0ddf5d044e6 100644
--- a/TAO/tao/IIOP_Acceptor.cpp
+++ b/TAO/tao/IIOP_Acceptor.cpp
@@ -779,7 +779,8 @@ TAO_IIOP_Acceptor::object_key (IOP::TaggedProfile &profile,
                     profile.profile_data.length ());
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
 
-  CORBA::Octet major, minor;
+  CORBA::Octet major;
+  CORBA::Octet minor;
 
   // Read the version. We just read it here. We don't*do any*
   // processing.
diff --git a/TAO/tao/IIOP_EndpointsA.cpp b/TAO/tao/IIOP_EndpointsA.cpp
deleted file mode 100644
index 5ea6a8c8da9..00000000000
--- a/TAO/tao/IIOP_EndpointsA.cpp
+++ /dev/null
@@ -1,233 +0,0 @@
-// -*- 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/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "IIOP_EndpointsC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/Recursive_Type_TypeCode.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_TAO_IIOP_Endpoint_Info[] =
-  {
-    { "host", &CORBA::_tc_string },
-    { "port", &CORBA::_tc_short },
-    { "priority", &CORBA::_tc_short }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_TAO_IIOP_Endpoint_Info (
-    CORBA::tk_struct,
-    "IDL:TAO/IIOP_Endpoint_Info:1.0",
-    "IIOP_Endpoint_Info",
-    _tao_fields_TAO_IIOP_Endpoint_Info,
-    3);
-  
-namespace TAO
-{
-  ::CORBA::TypeCode_ptr const _tc_IIOP_Endpoint_Info =
-    &_tao_tc_TAO_IIOP_Endpoint_Info;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_TAO_IIOPEndpointSequence_GUARD
-#define _TAO_TYPECODE_TAO_IIOPEndpointSequence_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      TAO_IIOPEndpointSequence_0 (
-        CORBA::tk_sequence,
-        &TAO::_tc_IIOP_Endpoint_Info,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_TAO_IIOPEndpointSequence_0 =
-      &TAO_IIOPEndpointSequence_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_TAO_IIOPEndpointSequence_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_TAO_IIOPEndpointSequence (
-    CORBA::tk_alias,
-    "IDL:TAO/IIOPEndpointSequence:1.0",
-    "IIOPEndpointSequence",
-    &TAO::TypeCode::tc_TAO_IIOPEndpointSequence_0);
-  
-namespace TAO
-{
-  ::CORBA::TypeCode_ptr const _tc_IIOPEndpointSequence =
-    &_tao_tc_TAO_IIOPEndpointSequence;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const TAO::IIOP_Endpoint_Info &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<TAO::IIOP_Endpoint_Info>::insert_copy (
-      _tao_any,
-      TAO::IIOP_Endpoint_Info::_tao_any_destructor,
-      TAO::_tc_IIOP_Endpoint_Info,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    TAO::IIOP_Endpoint_Info *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<TAO::IIOP_Endpoint_Info>::insert (
-      _tao_any,
-      TAO::IIOP_Endpoint_Info::_tao_any_destructor,
-      TAO::_tc_IIOP_Endpoint_Info,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    TAO::IIOP_Endpoint_Info *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const TAO::IIOP_Endpoint_Info *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const TAO::IIOP_Endpoint_Info *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<TAO::IIOP_Endpoint_Info>::extract (
-        _tao_any,
-        TAO::IIOP_Endpoint_Info::_tao_any_destructor,
-        TAO::_tc_IIOP_Endpoint_Info,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const TAO::IIOPEndpointSequence &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<TAO::IIOPEndpointSequence>::insert_copy (
-      _tao_any,
-      TAO::IIOPEndpointSequence::_tao_any_destructor,
-      TAO::TypeCode::tc_TAO_IIOPEndpointSequence_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    TAO::IIOPEndpointSequence *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<TAO::IIOPEndpointSequence>::insert (
-      _tao_any,
-      TAO::IIOPEndpointSequence::_tao_any_destructor,
-      TAO::TypeCode::tc_TAO_IIOPEndpointSequence_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    TAO::IIOPEndpointSequence *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const TAO::IIOPEndpointSequence *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const TAO::IIOPEndpointSequence *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<TAO::IIOPEndpointSequence>::extract (
-        _tao_any,
-        TAO::IIOPEndpointSequence::_tao_any_destructor,
-        TAO::TypeCode::tc_TAO_IIOPEndpointSequence_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/IIOP_EndpointsC.h b/TAO/tao/IIOP_EndpointsC.h
index 95077b7450c..2b780ea4150 100644
--- a/TAO/tao/IIOP_EndpointsC.h
+++ b/TAO/tao/IIOP_EndpointsC.h
@@ -67,58 +67,53 @@
 
 namespace TAO
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct IIOP_Endpoint_Info;
-  
+
   typedef
     TAO_Var_Var_T<
         IIOP_Endpoint_Info
       >
     IIOP_Endpoint_Info_var;
-  
+
   typedef
     TAO_Out_T<
         IIOP_Endpoint_Info,
         IIOP_Endpoint_Info_var
       >
     IIOP_Endpoint_Info_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:52
-  
+
   struct TAO_Export IIOP_Endpoint_Info
   {
     typedef IIOP_Endpoint_Info_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     TAO_String_Manager host;
     CORBA::Short port;
     CORBA::Short priority;
   };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_IIOP_Endpoint_Info;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_TAO_IIOPENDPOINTSEQUENCE_CH_)
 #define _TAO_IIOPENDPOINTSEQUENCE_CH_
-  
+
   class IIOPEndpointSequence;
-  
+
   typedef
     TAO_VarSeq_Var_T<
         IIOPEndpointSequence,
         IIOP_Endpoint_Info
       >
     IIOPEndpointSequence_var;
-  
+
   typedef
     TAO_Seq_Out_T<
         IIOPEndpointSequence,
@@ -126,7 +121,7 @@ namespace TAO
         IIOP_Endpoint_Info
       >
     IIOPEndpointSequence_out;
-  
+
   class TAO_Export IIOPEndpointSequence
     : public
         TAO_Unbounded_Sequence<
@@ -139,23 +134,18 @@ namespace TAO
     IIOPEndpointSequence (
         CORBA::ULong max,
         CORBA::ULong length,
-        IIOP_Endpoint_Info* buffer, 
+        IIOP_Endpoint_Info* buffer,
         CORBA::Boolean release = 0
       );
     IIOPEndpointSequence (const IIOPEndpointSequence &);
     ~IIOPEndpointSequence (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef IIOPEndpointSequence_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_IIOPEndpointSequence;
 
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:66
@@ -171,22 +161,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const TAO::IIOP_Endpoint_Info &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, TAO::IIOP_Endpoint_Info*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::IIOP_Endpoint_Info *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO::IIOP_Endpoint_Info *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const TAO::IIOPEndpointSequence &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, TAO::IIOPEndpointSequence*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::IIOPEndpointSequence *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO::IIOPEndpointSequence *&);
-
-// TAO_IDL - Generated from
 // be\be_visitor_structure/cdr_op_ch.cpp:54
 
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO::IIOP_Endpoint_Info &);
diff --git a/TAO/tao/IOPC.cpp b/TAO/tao/IOPC.cpp
index 9053a1fe2c3..b5108933284 100644
--- a/TAO/tao/IOPC.cpp
+++ b/TAO/tao/IOPC.cpp
@@ -26,16 +26,12 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:288
 
 
 #include "IOPC.h"
 #include "tao/CDR.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
diff --git a/TAO/tao/IOPC.h b/TAO/tao/IOPC.h
index 392a5d9e1f4..e0bbb0a432a 100644
--- a/TAO/tao/IOPC.h
+++ b/TAO/tao/IOPC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_IOPC_H_
-#define _TAO_IDL_ORIG_IOPC_H_
+#ifndef _TAO_IDL_IOPC_H_
+#define _TAO_IDL_IOPC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -56,10 +56,6 @@
 #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
 // be\be_visitor_traits.cpp:61
 
@@ -69,16 +65,12 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
+// be\be_codegen.cpp:1062
 
 #if defined(_MSC_VER)
 #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/IOP_IORA.cpp b/TAO/tao/IOP_IORA.cpp
deleted file mode 100644
index 1c268452262..00000000000
--- a/TAO/tao/IOP_IORA.cpp
+++ /dev/null
@@ -1,998 +0,0 @@
-// -*- 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/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "IOP_IORC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/Recursive_Type_TypeCode.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_IOP_ProfileId (
-    CORBA::tk_alias,
-    "IDL:omg.org/IOP/ProfileId:1.0",
-    "ProfileId",
-    &CORBA::_tc_ulong);
-  
-namespace IOP
-{
-  ::CORBA::TypeCode_ptr const _tc_ProfileId =
-    &_tao_tc_IOP_ProfileId;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_IOP_TaggedProfile[] =
-  {
-    { "tag", &IOP::_tc_ProfileId },
-    { "profile_data", &CORBA::_tc_OctetSeq }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_IOP_TaggedProfile (
-    CORBA::tk_struct,
-    "IDL:omg.org/IOP/TaggedProfile:1.0",
-    "TaggedProfile",
-    _tao_fields_IOP_TaggedProfile,
-    2);
-  
-namespace IOP
-{
-  ::CORBA::TypeCode_ptr const _tc_TaggedProfile =
-    &_tao_tc_IOP_TaggedProfile;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_IOP_TaggedProfileSeq_GUARD
-#define _TAO_TYPECODE_IOP_TaggedProfileSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      IOP_TaggedProfileSeq_0 (
-        CORBA::tk_sequence,
-        &IOP::_tc_TaggedProfile,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_IOP_TaggedProfileSeq_0 =
-      &IOP_TaggedProfileSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_IOP_TaggedProfileSeq_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_IOP_TaggedProfileSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/IOP/TaggedProfileSeq:1.0",
-    "TaggedProfileSeq",
-    &TAO::TypeCode::tc_IOP_TaggedProfileSeq_0);
-  
-namespace IOP
-{
-  ::CORBA::TypeCode_ptr const _tc_TaggedProfileSeq =
-    &_tao_tc_IOP_TaggedProfileSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_IOP_IOR[] =
-  {
-    { "type_id", &CORBA::_tc_string },
-    { "profiles", &IOP::_tc_TaggedProfileSeq }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_IOP_IOR (
-    CORBA::tk_struct,
-    "IDL:omg.org/IOP/IOR:1.0",
-    "IOR",
-    _tao_fields_IOP_IOR,
-    2);
-  
-namespace IOP
-{
-  ::CORBA::TypeCode_ptr const _tc_IOR =
-    &_tao_tc_IOP_IOR;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_IOP_ComponentId (
-    CORBA::tk_alias,
-    "IDL:omg.org/IOP/ComponentId:1.0",
-    "ComponentId",
-    &CORBA::_tc_ulong);
-  
-namespace IOP
-{
-  ::CORBA::TypeCode_ptr const _tc_ComponentId =
-    &_tao_tc_IOP_ComponentId;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_IOP_TaggedComponent[] =
-  {
-    { "tag", &IOP::_tc_ComponentId },
-    { "component_data", &CORBA::_tc_OctetSeq }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_IOP_TaggedComponent (
-    CORBA::tk_struct,
-    "IDL:omg.org/IOP/TaggedComponent:1.0",
-    "TaggedComponent",
-    _tao_fields_IOP_TaggedComponent,
-    2);
-  
-namespace IOP
-{
-  ::CORBA::TypeCode_ptr const _tc_TaggedComponent =
-    &_tao_tc_IOP_TaggedComponent;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_IOP_MultipleComponentProfile_GUARD
-#define _TAO_TYPECODE_IOP_MultipleComponentProfile_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      IOP_MultipleComponentProfile_0 (
-        CORBA::tk_sequence,
-        &IOP::_tc_TaggedComponent,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_IOP_MultipleComponentProfile_0 =
-      &IOP_MultipleComponentProfile_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_IOP_MultipleComponentProfile_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_IOP_MultipleComponentProfile (
-    CORBA::tk_alias,
-    "IDL:omg.org/IOP/MultipleComponentProfile:1.0",
-    "MultipleComponentProfile",
-    &TAO::TypeCode::tc_IOP_MultipleComponentProfile_0);
-  
-namespace IOP
-{
-  ::CORBA::TypeCode_ptr const _tc_MultipleComponentProfile =
-    &_tao_tc_IOP_MultipleComponentProfile;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_IOP_TaggedComponentList_GUARD
-#define _TAO_TYPECODE_IOP_TaggedComponentList_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      IOP_TaggedComponentList_0 (
-        CORBA::tk_sequence,
-        &IOP::_tc_TaggedComponent,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_IOP_TaggedComponentList_0 =
-      &IOP_TaggedComponentList_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_IOP_TaggedComponentList_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_IOP_TaggedComponentList (
-    CORBA::tk_alias,
-    "IDL:omg.org/IOP/TaggedComponentList:1.0",
-    "TaggedComponentList",
-    &TAO::TypeCode::tc_IOP_TaggedComponentList_0);
-  
-namespace IOP
-{
-  ::CORBA::TypeCode_ptr const _tc_TaggedComponentList =
-    &_tao_tc_IOP_TaggedComponentList;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_IOP_TaggedComponentSeq_GUARD
-#define _TAO_TYPECODE_IOP_TaggedComponentSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      IOP_TaggedComponentSeq_0 (
-        CORBA::tk_sequence,
-        &IOP::_tc_TaggedComponent,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_IOP_TaggedComponentSeq_0 =
-      &IOP_TaggedComponentSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_IOP_TaggedComponentSeq_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_IOP_TaggedComponentSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/IOP/TaggedComponentSeq:1.0",
-    "TaggedComponentSeq",
-    &TAO::TypeCode::tc_IOP_TaggedComponentSeq_0);
-  
-namespace IOP
-{
-  ::CORBA::TypeCode_ptr const _tc_TaggedComponentSeq =
-    &_tao_tc_IOP_TaggedComponentSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_IOP_ServiceId (
-    CORBA::tk_alias,
-    "IDL:omg.org/IOP/ServiceId:1.0",
-    "ServiceId",
-    &CORBA::_tc_ulong);
-  
-namespace IOP
-{
-  ::CORBA::TypeCode_ptr const _tc_ServiceId =
-    &_tao_tc_IOP_ServiceId;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_IOP_ServiceContext[] =
-  {
-    { "context_id", &IOP::_tc_ServiceId },
-    { "context_data", &CORBA::_tc_OctetSeq }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_IOP_ServiceContext (
-    CORBA::tk_struct,
-    "IDL:omg.org/IOP/ServiceContext:1.0",
-    "ServiceContext",
-    _tao_fields_IOP_ServiceContext,
-    2);
-  
-namespace IOP
-{
-  ::CORBA::TypeCode_ptr const _tc_ServiceContext =
-    &_tao_tc_IOP_ServiceContext;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_IOP_ServiceContextList_GUARD
-#define _TAO_TYPECODE_IOP_ServiceContextList_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      IOP_ServiceContextList_0 (
-        CORBA::tk_sequence,
-        &IOP::_tc_ServiceContext,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_IOP_ServiceContextList_0 =
-      &IOP_ServiceContextList_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_IOP_ServiceContextList_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_IOP_ServiceContextList (
-    CORBA::tk_alias,
-    "IDL:omg.org/IOP/ServiceContextList:1.0",
-    "ServiceContextList",
-    &TAO::TypeCode::tc_IOP_ServiceContextList_0);
-  
-namespace IOP
-{
-  ::CORBA::TypeCode_ptr const _tc_ServiceContextList =
-    &_tao_tc_IOP_ServiceContextList;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const IOP::TaggedProfile &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::TaggedProfile>::insert_copy (
-      _tao_any,
-      IOP::TaggedProfile::_tao_any_destructor,
-      IOP::_tc_TaggedProfile,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    IOP::TaggedProfile *_tao_elem
-  )
-{
-  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).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    IOP::TaggedProfile *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const IOP::TaggedProfile *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IOP::TaggedProfile *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<IOP::TaggedProfile>::extract (
-        _tao_any,
-        IOP::TaggedProfile::_tao_any_destructor,
-        IOP::_tc_TaggedProfile,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const IOP::TaggedProfileSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::TaggedProfileSeq>::insert_copy (
-      _tao_any,
-      IOP::TaggedProfileSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_IOP_TaggedProfileSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    IOP::TaggedProfileSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::TaggedProfileSeq>::insert (
-      _tao_any,
-      IOP::TaggedProfileSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_IOP_TaggedProfileSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    IOP::TaggedProfileSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const IOP::TaggedProfileSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IOP::TaggedProfileSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<IOP::TaggedProfileSeq>::extract (
-        _tao_any,
-        IOP::TaggedProfileSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_IOP_TaggedProfileSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const IOP::IOR &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::IOR>::insert_copy (
-      _tao_any,
-      IOP::IOR::_tao_any_destructor,
-      IOP::_tc_IOR,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    IOP::IOR *_tao_elem
-  )
-{
-  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).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    IOP::IOR *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const IOP::IOR *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IOP::IOR *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<IOP::IOR>::extract (
-        _tao_any,
-        IOP::IOR::_tao_any_destructor,
-        IOP::_tc_IOR,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const IOP::TaggedComponent &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::TaggedComponent>::insert_copy (
-      _tao_any,
-      IOP::TaggedComponent::_tao_any_destructor,
-      IOP::_tc_TaggedComponent,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    IOP::TaggedComponent *_tao_elem
-  )
-{
-  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).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    IOP::TaggedComponent *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const IOP::TaggedComponent *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IOP::TaggedComponent *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<IOP::TaggedComponent>::extract (
-        _tao_any,
-        IOP::TaggedComponent::_tao_any_destructor,
-        IOP::_tc_TaggedComponent,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const IOP::MultipleComponentProfile &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::MultipleComponentProfile>::insert_copy (
-      _tao_any,
-      IOP::MultipleComponentProfile::_tao_any_destructor,
-      TAO::TypeCode::tc_IOP_MultipleComponentProfile_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    IOP::MultipleComponentProfile *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::MultipleComponentProfile>::insert (
-      _tao_any,
-      IOP::MultipleComponentProfile::_tao_any_destructor,
-      TAO::TypeCode::tc_IOP_MultipleComponentProfile_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    IOP::MultipleComponentProfile *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const IOP::MultipleComponentProfile *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IOP::MultipleComponentProfile *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<IOP::MultipleComponentProfile>::extract (
-        _tao_any,
-        IOP::MultipleComponentProfile::_tao_any_destructor,
-        TAO::TypeCode::tc_IOP_MultipleComponentProfile_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const IOP::TaggedComponentList &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::TaggedComponentList>::insert_copy (
-      _tao_any,
-      IOP::TaggedComponentList::_tao_any_destructor,
-      TAO::TypeCode::tc_IOP_TaggedComponentList_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    IOP::TaggedComponentList *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::TaggedComponentList>::insert (
-      _tao_any,
-      IOP::TaggedComponentList::_tao_any_destructor,
-      TAO::TypeCode::tc_IOP_TaggedComponentList_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    IOP::TaggedComponentList *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const IOP::TaggedComponentList *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IOP::TaggedComponentList *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<IOP::TaggedComponentList>::extract (
-        _tao_any,
-        IOP::TaggedComponentList::_tao_any_destructor,
-        TAO::TypeCode::tc_IOP_TaggedComponentList_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const IOP::TaggedComponentSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::TaggedComponentSeq>::insert_copy (
-      _tao_any,
-      IOP::TaggedComponentSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_IOP_TaggedComponentSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    IOP::TaggedComponentSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::TaggedComponentSeq>::insert (
-      _tao_any,
-      IOP::TaggedComponentSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_IOP_TaggedComponentSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    IOP::TaggedComponentSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const IOP::TaggedComponentSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IOP::TaggedComponentSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<IOP::TaggedComponentSeq>::extract (
-        _tao_any,
-        IOP::TaggedComponentSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_IOP_TaggedComponentSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const IOP::ServiceContext &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::ServiceContext>::insert_copy (
-      _tao_any,
-      IOP::ServiceContext::_tao_any_destructor,
-      IOP::_tc_ServiceContext,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    IOP::ServiceContext *_tao_elem
-  )
-{
-  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).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    IOP::ServiceContext *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const IOP::ServiceContext *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IOP::ServiceContext *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<IOP::ServiceContext>::extract (
-        _tao_any,
-        IOP::ServiceContext::_tao_any_destructor,
-        IOP::_tc_ServiceContext,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const IOP::ServiceContextList &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::ServiceContextList>::insert_copy (
-      _tao_any,
-      IOP::ServiceContextList::_tao_any_destructor,
-      TAO::TypeCode::tc_IOP_ServiceContextList_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    IOP::ServiceContextList *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::ServiceContextList>::insert (
-      _tao_any,
-      IOP::ServiceContextList::_tao_any_destructor,
-      TAO::TypeCode::tc_IOP_ServiceContextList_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    IOP::ServiceContextList *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const IOP::ServiceContextList *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IOP::ServiceContextList *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<IOP::ServiceContextList>::extract (
-        _tao_any,
-        IOP::ServiceContextList::_tao_any_destructor,
-        TAO::TypeCode::tc_IOP_ServiceContextList_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/IOP_IORC.cpp b/TAO/tao/IOP_IORC.cpp
index 816b166ac49..0dcb0c1062d 100644
--- a/TAO/tao/IOP_IORC.cpp
+++ b/TAO/tao/IOP_IORC.cpp
@@ -26,17 +26,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:288
 
 
 #include "IOP_IORC.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__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
@@ -72,7 +68,7 @@ IOP::TaggedProfileSeq::TaggedProfileSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Sequence<
-        IOP::TaggedProfile
+        TaggedProfile
       >
     (max)
 {}
@@ -84,7 +80,7 @@ IOP::TaggedProfileSeq::TaggedProfileSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Sequence<
-        IOP::TaggedProfile
+        TaggedProfile
       >
     (max, length, buffer, release)
 {}
@@ -93,7 +89,7 @@ IOP::TaggedProfileSeq::TaggedProfileSeq (
     const TaggedProfileSeq &seq
   )
   : TAO_Unbounded_Sequence<
-        IOP::TaggedProfile
+        TaggedProfile
       >
     (seq)
 {}
@@ -151,7 +147,7 @@ IOP::MultipleComponentProfile::MultipleComponentProfile (
     CORBA::ULong max
   )
   : TAO_Unbounded_Sequence<
-        IOP::TaggedComponent
+        TaggedComponent
       >
     (max)
 {}
@@ -163,7 +159,7 @@ IOP::MultipleComponentProfile::MultipleComponentProfile (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Sequence<
-        IOP::TaggedComponent
+        TaggedComponent
       >
     (max, length, buffer, release)
 {}
@@ -172,7 +168,7 @@ IOP::MultipleComponentProfile::MultipleComponentProfile (
     const MultipleComponentProfile &seq
   )
   : TAO_Unbounded_Sequence<
-        IOP::TaggedComponent
+        TaggedComponent
       >
     (seq)
 {}
@@ -204,7 +200,7 @@ IOP::TaggedComponentList::TaggedComponentList (
     CORBA::ULong max
   )
   : TAO_Unbounded_Sequence<
-        IOP::TaggedComponent
+        TaggedComponent
       >
     (max)
 {}
@@ -216,7 +212,7 @@ IOP::TaggedComponentList::TaggedComponentList (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Sequence<
-        IOP::TaggedComponent
+        TaggedComponent
       >
     (max, length, buffer, release)
 {}
@@ -225,7 +221,7 @@ IOP::TaggedComponentList::TaggedComponentList (
     const TaggedComponentList &seq
   )
   : TAO_Unbounded_Sequence<
-        IOP::TaggedComponent
+        TaggedComponent
       >
     (seq)
 {}
@@ -257,7 +253,7 @@ IOP::TaggedComponentSeq::TaggedComponentSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Sequence<
-        IOP::TaggedComponent
+        TaggedComponent
       >
     (max)
 {}
@@ -269,7 +265,7 @@ IOP::TaggedComponentSeq::TaggedComponentSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Sequence<
-        IOP::TaggedComponent
+        TaggedComponent
       >
     (max, length, buffer, release)
 {}
@@ -278,7 +274,7 @@ IOP::TaggedComponentSeq::TaggedComponentSeq (
     const TaggedComponentSeq &seq
   )
   : TAO_Unbounded_Sequence<
-        IOP::TaggedComponent
+        TaggedComponent
       >
     (seq)
 {}
@@ -323,7 +319,7 @@ IOP::ServiceContextList::ServiceContextList (
     CORBA::ULong max
   )
   : TAO_Unbounded_Sequence<
-        IOP::ServiceContext
+        ServiceContext
       >
     (max)
 {}
@@ -335,7 +331,7 @@ IOP::ServiceContextList::ServiceContextList (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Sequence<
-        IOP::ServiceContext
+        ServiceContext
       >
     (max, length, buffer, release)
 {}
@@ -344,7 +340,7 @@ IOP::ServiceContextList::ServiceContextList (
     const ServiceContextList &seq
   )
   : TAO_Unbounded_Sequence<
-        IOP::ServiceContext
+        ServiceContext
       >
     (seq)
 {}
diff --git a/TAO/tao/IOP_IORC.h b/TAO/tao/IOP_IORC.h
index 496f143ca0a..4bf5d87e8d1 100644
--- a/TAO/tao/IOP_IORC.h
+++ b/TAO/tao/IOP_IORC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_IOP_IORC_H_
-#define _TAO_IDL_ORIG_IOP_IORC_H_
+#ifndef _TAO_IDL_IOP_IORC_H_
+#define _TAO_IDL_IOP_IORC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -60,12 +60,8 @@
 #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
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace IOP
 {
@@ -77,11 +73,6 @@ namespace IOP
   typedef CORBA::ULong_out ProfileId_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ProfileId;
-  
-  // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
   
   const IOP::ProfileId TAG_INTERNET_IOP = 0U;
@@ -110,7 +101,7 @@ namespace IOP
     TaggedProfile_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
+  // be\be_visitor_structure/structure_ch.cpp:57
   
   struct TAO_Export TaggedProfile
   {
@@ -122,11 +113,6 @@ namespace IOP
   };
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_TaggedProfile;
-  
-  // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_IOP_TAGGEDPROFILESEQ_CH_)
@@ -175,11 +161,6 @@ namespace IOP
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_TaggedProfileSeq;
-  
-  // TAO_IDL - Generated from
   // be\be_type.cpp:258
   
   struct IOR;
@@ -198,7 +179,7 @@ namespace IOP
     IOR_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
+  // be\be_visitor_structure/structure_ch.cpp:57
   
   struct TAO_Export IOR
   {
@@ -210,22 +191,12 @@ namespace IOP
   };
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_IOR;
-  
-  // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:379
   
   typedef CORBA::ULong ComponentId;
   typedef CORBA::ULong_out ComponentId_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ComponentId;
-  
-  // TAO_IDL - Generated from
   // be\be_type.cpp:258
   
   struct TaggedComponent;
@@ -244,7 +215,7 @@ namespace IOP
     TaggedComponent_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
+  // be\be_visitor_structure/structure_ch.cpp:57
   
   struct TAO_Export TaggedComponent
   {
@@ -256,11 +227,6 @@ namespace IOP
   };
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_TaggedComponent;
-  
-  // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_IOP_MULTIPLECOMPONENTPROFILE_CH_)
@@ -309,11 +275,6 @@ namespace IOP
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_MultipleComponentProfile;
-  
-  // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_IOP_TAGGEDCOMPONENTLIST_CH_)
@@ -362,11 +323,6 @@ namespace IOP
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_TaggedComponentList;
-  
-  // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_IOP_TAGGEDCOMPONENTSEQ_CH_)
@@ -415,11 +371,6 @@ namespace IOP
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_TaggedComponentSeq;
-  
-  // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
   
   const IOP::ComponentId TAG_ORB_TYPE = 0U;
@@ -476,11 +427,6 @@ namespace IOP
   typedef CORBA::ULong_out ServiceId_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ServiceId;
-  
-  // TAO_IDL - Generated from
   // be\be_type.cpp:258
   
   struct ServiceContext;
@@ -499,7 +445,7 @@ namespace IOP
     ServiceContext_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
+  // be\be_visitor_structure/structure_ch.cpp:57
   
   struct TAO_Export ServiceContext
   {
@@ -511,11 +457,6 @@ namespace IOP
   };
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ServiceContext;
-  
-  // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_IOP_SERVICECONTEXTLIST_CH_)
@@ -564,11 +505,6 @@ namespace IOP
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ServiceContextList;
-  
-  // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
   
   const IOP::ServiceId TransactionService = 0U;
@@ -664,7 +600,7 @@ namespace IOP
   const IOP::ComponentId TAG_GROUP_IIOP = 40U;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module IOP
 
@@ -677,78 +613,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// 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
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const IOP::TaggedProfileSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, IOP::TaggedProfileSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::TaggedProfileSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::TaggedProfileSeq *&);
-
-// TAO_IDL - Generated from
-// 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
-// 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
-// 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
-// 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
-// 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
-// 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
-// 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 *&);
-
-// TAO_IDL - Generated from
 // be\be_visitor_structure/cdr_op_ch.cpp:54
 
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IOP::TaggedProfile &);
@@ -858,16 +722,12 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_IOP_ServiceContextList_H_ */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
+// be\be_codegen.cpp:1062
 
 #if defined(_MSC_VER)
 #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/IORInterceptor.mpc b/TAO/tao/IORInterceptor.mpc
index 0500c435f1e..45e5936e409 100644
--- a/TAO/tao/IORInterceptor.mpc
+++ b/TAO/tao/IORInterceptor.mpc
@@ -27,6 +27,9 @@ project : taolib, portableserver, objreftemplate, pi, core {
     IORInterceptor
   }
 
+  IDL_Files {
+  }
+
   Pkgconfig_Files {
     IORInterceptor/TAO_IORInterceptor.pc.in
   }
diff --git a/TAO/tao/IORInterceptor/IORInfoC.cpp b/TAO/tao/IORInterceptor/IORInfoC.cpp
index 584dcd8d6f1..e20c34af88b 100644
--- a/TAO/tao/IORInterceptor/IORInfoC.cpp
+++ b/TAO/tao/IORInterceptor/IORInfoC.cpp
@@ -47,7 +47,7 @@ namespace TAO
 
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ARG_TRAITS_CS_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ARG_TRAITS_CS_
-  
+
   template<>
   class Arg_Traits<PortableInterceptor::ObjectReferenceFactory>
     : public
@@ -55,7 +55,8 @@ namespace TAO
             PortableInterceptor::ObjectReferenceFactory *,
             PortableInterceptor::ObjectReferenceFactory_var,
             PortableInterceptor::ObjectReferenceFactory_out,
-            TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>
+            TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>,
+            TAO::Any_Insert_Policy_Stream <PortableInterceptor::ObjectReferenceFactory *>
           >
   {
   };
@@ -135,7 +136,7 @@ PortableInterceptor::IORInfo::_duplicate (IORInfo_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
diff --git a/TAO/tao/IORManipulation.mpc b/TAO/tao/IORManipulation.mpc
index af964e2a3aa..bb732c53194 100644
--- a/TAO/tao/IORManipulation.mpc
+++ b/TAO/tao/IORManipulation.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project : taolib, core {
+project : taolib, core, anytypecode {
   sharedname   = TAO_IORManip
   dynamicflags = TAO_IORMANIP_BUILD_DLL
 
@@ -27,6 +27,9 @@ project : taolib, core {
     IORManipulation
   }
 
+  IDL_Files {
+  }
+
   Pkgconfig_Files {
     IORManipulation/TAO_IORManip.pc.in
   }
diff --git a/TAO/tao/IORManipulation/IORA.cpp b/TAO/tao/IORManipulation/IORA.cpp
index c433be40bdb..164f0dc60b9 100644
--- a/TAO/tao/IORManipulation/IORA.cpp
+++ b/TAO/tao/IORManipulation/IORA.cpp
@@ -26,17 +26,17 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "IORManip_Loader.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Sequence_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
 // be/be_visitor_typecode/struct_typecode.cpp:74
@@ -53,7 +53,7 @@ static TAO::TypeCode::Struct<char const *,
     "EmptyProfileList",
     _tao_fields_TAO_IOP_EmptyProfileList,
     0);
-  
+
 namespace TAO_IOP
 {
   ::CORBA::TypeCode_ptr const _tc_EmptyProfileList =
@@ -77,7 +77,7 @@ static TAO::TypeCode::Struct<char const *,
     "NotFound",
     _tao_fields_TAO_IOP_NotFound,
     0);
-  
+
 namespace TAO_IOP
 {
   ::CORBA::TypeCode_ptr const _tc_NotFound =
@@ -101,7 +101,7 @@ static TAO::TypeCode::Struct<char const *,
     "Duplicate",
     _tao_fields_TAO_IOP_Duplicate,
     0);
-  
+
 namespace TAO_IOP
 {
   ::CORBA::TypeCode_ptr const _tc_Duplicate =
@@ -125,7 +125,7 @@ static TAO::TypeCode::Struct<char const *,
     "Invalid_IOR",
     _tao_fields_TAO_IOP_Invalid_IOR,
     0);
-  
+
 namespace TAO_IOP
 {
   ::CORBA::TypeCode_ptr const _tc_Invalid_IOR =
@@ -149,7 +149,7 @@ static TAO::TypeCode::Struct<char const *,
     "MultiProfileList",
     _tao_fields_TAO_IOP_MultiProfileList,
     0);
-  
+
 namespace TAO_IOP
 {
   ::CORBA::TypeCode_ptr const _tc_MultiProfileList =
@@ -167,7 +167,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:TAO_IOP/TAO_IOR_Property:1.0",
     "TAO_IOR_Property");
-  
+
 namespace TAO_IOP
 {
   ::CORBA::TypeCode_ptr const _tc_TAO_IOR_Property =
@@ -197,10 +197,10 @@ namespace TAO
         CORBA::tk_sequence,
         &CORBA::_tc_Object,
         0U);
-      
+
     ::CORBA::TypeCode_ptr const tc_TAO_IOP_TAO_IOR_Manipulation_IORList_0 =
       &TAO_IOP_TAO_IOR_Manipulation_IORList_0;
-    
+
   }
 }
 
@@ -214,7 +214,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:TAO_IOP/TAO_IOR_Manipulation/IORList:1.0",
     "IORList",
     &TAO::TypeCode::tc_TAO_IOP_TAO_IOR_Manipulation_IORList_0);
-  
+
 ::CORBA::TypeCode_ptr const TAO_IOP::TAO_IOR_Manipulation::_tc_IORList =
   &_tao_tc_TAO_IOP_TAO_IOR_Manipulation_IORList;
 
@@ -227,7 +227,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:TAO_IOP/TAO_IOR_Manipulation:1.0",
     "TAO_IOR_Manipulation");
-  
+
 namespace TAO_IOP
 {
   ::CORBA::TypeCode_ptr const _tc_TAO_IOR_Manipulation =
@@ -236,7 +236,7 @@ namespace TAO_IOP
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be/be_visitor_exception/any_op_cs.cpp:50
 
 namespace TAO
@@ -248,12 +248,12 @@ namespace TAO
     )
   {
     CORBA::String_var id;
-    
+
     if (!(cdr >> id.out ()))
       {
         return false;
       }
-    
+
     ACE_TRY_NEW_ENV
       {
         this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
@@ -264,7 +264,7 @@ namespace TAO
         return false;
       }
     ACE_ENDTRY;
-    
+
     return true;
   }
 }
@@ -324,7 +324,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be/be_visitor_exception/any_op_cs.cpp:50
 
 namespace TAO
@@ -336,12 +336,12 @@ namespace TAO
     )
   {
     CORBA::String_var id;
-    
+
     if (!(cdr >> id.out ()))
       {
         return false;
       }
-    
+
     ACE_TRY_NEW_ENV
       {
         this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
@@ -352,7 +352,7 @@ namespace TAO
         return false;
       }
     ACE_ENDTRY;
-    
+
     return true;
   }
 }
@@ -412,7 +412,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be/be_visitor_exception/any_op_cs.cpp:50
 
 namespace TAO
@@ -424,12 +424,12 @@ namespace TAO
     )
   {
     CORBA::String_var id;
-    
+
     if (!(cdr >> id.out ()))
       {
         return false;
       }
-    
+
     ACE_TRY_NEW_ENV
       {
         this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
@@ -440,7 +440,7 @@ namespace TAO
         return false;
       }
     ACE_ENDTRY;
-    
+
     return true;
   }
 }
@@ -500,7 +500,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be/be_visitor_exception/any_op_cs.cpp:50
 
 namespace TAO
@@ -512,12 +512,12 @@ namespace TAO
     )
   {
     CORBA::String_var id;
-    
+
     if (!(cdr >> id.out ()))
       {
         return false;
       }
-    
+
     ACE_TRY_NEW_ENV
       {
         this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
@@ -528,7 +528,7 @@ namespace TAO
         return false;
       }
     ACE_ENDTRY;
-    
+
     return true;
   }
 }
@@ -588,7 +588,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be/be_visitor_exception/any_op_cs.cpp:50
 
 namespace TAO
@@ -600,12 +600,12 @@ namespace TAO
     )
   {
     CORBA::String_var id;
-    
+
     if (!(cdr >> id.out ()))
       {
         return false;
       }
-    
+
     ACE_TRY_NEW_ENV
       {
         this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
@@ -616,7 +616,7 @@ namespace TAO
         return false;
       }
     ACE_ENDTRY;
-    
+
     return true;
   }
 }
@@ -700,7 +700,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<TAO_IOP::TAO_IOR_Property>::demarshal_value (TAO_InputCDR &)
@@ -775,7 +775,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<TAO_IOP::TAO_IOR_Manipulation>::demarshal_value (TAO_InputCDR &)
@@ -826,7 +826,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be/be_visitor_sequence/any_op_cs.cpp:54
 
 namespace TAO
@@ -837,7 +837,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Dual_Impl_T<TAO_IOP::TAO_IOR_Manipulation::IORList>::demarshal_value (TAO_InputCDR &)
diff --git a/TAO/tao/IORTable.mpc b/TAO/tao/IORTable.mpc
index 92010d7a90f..1c706d457fb 100644
--- a/TAO/tao/IORTable.mpc
+++ b/TAO/tao/IORTable.mpc
@@ -4,7 +4,7 @@ project : taolib, core {
   dynamicflags = TAO_IORTABLE_BUILD_DLL
 
   Source_Files {
-    IORTable 
+    IORTable
   }
 
   Header_Files {
diff --git a/TAO/tao/ImR_Client.mpc b/TAO/tao/ImR_Client.mpc
index b7906ed913d..e47749ec0ae 100644
--- a/TAO/tao/ImR_Client.mpc
+++ b/TAO/tao/ImR_Client.mpc
@@ -27,6 +27,9 @@ project : taolib, core, portableserver {
     ImR_Client
   }
 
+  IDL_Files {
+  }
+
   Pkgconfig_Files {
     ImR_Client/TAO_ImR_Client.pc.in
   }
diff --git a/TAO/tao/ImR_Client/ImplRepo.pidl b/TAO/tao/ImR_Client/ImplRepo.pidl
index ca566711e42..8bc8366f28e 100644
--- a/TAO/tao/ImR_Client/ImplRepo.pidl
+++ b/TAO/tao/ImR_Client/ImplRepo.pidl
@@ -15,7 +15,7 @@
  */
 //=============================================================================
 
-#include "ServerObject.pidl"
+#include "tao/ImR_Client/ServerObject.pidl"
 
 module ImplementationRepository
 {
diff --git a/TAO/tao/ImR_Client/ImplRepoA.cpp b/TAO/tao/ImR_Client/ImplRepoA.cpp
index 2d3a83d6e60..6fd14f542ee 100644
--- a/TAO/tao/ImR_Client/ImplRepoA.cpp
+++ b/TAO/tao/ImR_Client/ImplRepoA.cpp
@@ -26,21 +26,21 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "ImplRepoC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Enum_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/Recursive_Type_TypeCode.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Enum_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Sequence_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
+#include "tao/AnyTypeCode/Recursive_Type_TypeCode.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
-#include "tao/Any_Basic_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Basic_Impl_T.h"
 
 // TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/struct_typecode.cpp:87
@@ -56,7 +56,7 @@ static TAO::TypeCode::Struct<char const *,
     "AlreadyRegistered",
     _tao_fields_ImplementationRepository_AlreadyRegistered,
     0);
- 
+
 namespace ImplementationRepository
 {
   ::CORBA::TypeCode_ptr const _tc_AlreadyRegistered =
@@ -71,7 +71,7 @@ namespace ImplementationRepository
 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_ImplementationRepository_CannotActivate[] =
   {
     { "reason", &CORBA::_tc_string }
- 
+
   };
 static TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
@@ -83,7 +83,7 @@ static TAO::TypeCode::Struct<char const *,
     "CannotActivate",
     _tao_fields_ImplementationRepository_CannotActivate,
     1);
- 
+
 namespace ImplementationRepository
 {
   ::CORBA::TypeCode_ptr const _tc_CannotActivate =
@@ -106,7 +106,7 @@ static TAO::TypeCode::Struct<char const *,
     "NotFound",
     _tao_fields_ImplementationRepository_NotFound,
     0);
- 
+
 namespace ImplementationRepository
 {
   ::CORBA::TypeCode_ptr const _tc_NotFound =
@@ -122,7 +122,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
   {
     { "name", &CORBA::_tc_string },
     { "value", &CORBA::_tc_string }
- 
+
   };
 static TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
@@ -134,7 +134,7 @@ static TAO::TypeCode::Struct<char const *,
     "EnvironmentVariable",
     _tao_fields_ImplementationRepository_EnvironmentVariable,
     2);
- 
+
 namespace ImplementationRepository
 {
   ::CORBA::TypeCode_ptr const _tc_EnvironmentVariable =
@@ -164,10 +164,10 @@ namespace TAO
         CORBA::tk_sequence,
         &ImplementationRepository::_tc_EnvironmentVariable,
         0U);
- 
+
     ::CORBA::TypeCode_ptr const tc_ImplementationRepository_EnvironmentList_0 =
       &ImplementationRepository_EnvironmentList_0;
- 
+
   }
 }
 
@@ -182,7 +182,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:ImplementationRepository/EnvironmentList:1.0",
     "EnvironmentList",
     &TAO::TypeCode::tc_ImplementationRepository_EnvironmentList_0);
- 
+
 namespace ImplementationRepository
 {
   ::CORBA::TypeCode_ptr const _tc_EnvironmentList =
@@ -200,7 +200,7 @@ static char const * const _tao_enumerators_ImplementationRepository_ActivationMo
     "MANUAL",
     "PER_CLIENT",
     "AUTO_START"
- 
+
   };
 
 static TAO::TypeCode::Enum<char const *,
@@ -211,7 +211,7 @@ static TAO::TypeCode::Enum<char const *,
     "ActivationMode",
     _tao_enumerators_ImplementationRepository_ActivationMode,
     4);
- 
+
 namespace ImplementationRepository
 {
   ::CORBA::TypeCode_ptr const _tc_ActivationMode =
@@ -236,7 +236,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
     { "activation", &ImplementationRepository::_tc_ActivationMode },
     { "activator", &CORBA::_tc_string },
     { "start_limit", &CORBA::_tc_long }
- 
+
   };
 static TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
@@ -248,7 +248,7 @@ static TAO::TypeCode::Struct<char const *,
     "StartupOptions",
     _tao_fields_ImplementationRepository_StartupOptions,
     6);
- 
+
 namespace ImplementationRepository
 {
   ::CORBA::TypeCode_ptr const _tc_StartupOptions =
@@ -265,7 +265,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
     { "server", &CORBA::_tc_string },
     { "startup", &ImplementationRepository::_tc_StartupOptions },
     { "partial_ior", &CORBA::_tc_string }
- 
+
   };
 static TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
@@ -277,7 +277,7 @@ static TAO::TypeCode::Struct<char const *,
     "ServerInformation",
     _tao_fields_ImplementationRepository_ServerInformation,
     3);
- 
+
 namespace ImplementationRepository
 {
   ::CORBA::TypeCode_ptr const _tc_ServerInformation =
@@ -307,10 +307,10 @@ namespace TAO
         CORBA::tk_sequence,
         &ImplementationRepository::_tc_ServerInformation,
         0U);
- 
+
     ::CORBA::TypeCode_ptr const tc_ImplementationRepository_ServerInformationList_0 =
       &ImplementationRepository_ServerInformationList_0;
- 
+
   }
 }
 
@@ -325,7 +325,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:ImplementationRepository/ServerInformationList:1.0",
     "ServerInformationList",
     &TAO::TypeCode::tc_ImplementationRepository_ServerInformationList_0);
- 
+
 namespace ImplementationRepository
 {
   ::CORBA::TypeCode_ptr const _tc_ServerInformationList =
@@ -343,7 +343,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_objref,
     "IDL:ImplementationRepository/ServerInformationIterator:1.0",
     "ServerInformationIterator");
- 
+
 namespace ImplementationRepository
 {
   ::CORBA::TypeCode_ptr const _tc_ServerInformationIterator =
@@ -361,7 +361,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_objref,
     "IDL:ImplementationRepository/Administration:1.0",
     "Administration");
- 
+
 namespace ImplementationRepository
 {
   ::CORBA::TypeCode_ptr const _tc_Administration =
@@ -382,12 +382,12 @@ namespace TAO
     )
   {
     CORBA::String_var id;
- 
+
     if (!(cdr >> id.out ()))
       {
         return false;
       }
- 
+
     ACE_TRY_NEW_ENV
       {
         this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
@@ -398,7 +398,7 @@ namespace TAO
         return false;
       }
     ACE_ENDTRY;
- 
+
     return true;
   }
 }
@@ -470,12 +470,12 @@ namespace TAO
     )
   {
     CORBA::String_var id;
- 
+
     if (!(cdr >> id.out ()))
       {
         return false;
       }
- 
+
     ACE_TRY_NEW_ENV
       {
         this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
@@ -486,7 +486,7 @@ namespace TAO
         return false;
       }
     ACE_ENDTRY;
- 
+
     return true;
   }
 }
@@ -558,12 +558,12 @@ namespace TAO
     )
   {
     CORBA::String_var id;
- 
+
     if (!(cdr >> id.out ()))
       {
         return false;
       }
- 
+
     ACE_TRY_NEW_ENV
       {
         this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
@@ -574,7 +574,7 @@ namespace TAO
         return false;
       }
     ACE_ENDTRY;
- 
+
     return true;
   }
 }
diff --git a/TAO/tao/ImR_Client/ImplRepoA.h b/TAO/tao/ImR_Client/ImplRepoA.h
new file mode 100644
index 00000000000..aaeab08b626
--- /dev/null
+++ b/TAO/tao/ImR_Client/ImplRepoA.h
@@ -0,0 +1,188 @@
+// -*- 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/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:805
+
+#ifndef _TAO_IDL_ORIG_IMPLREPOA_H_
+#define _TAO_IDL_ORIG_IMPLREPOA_H_
+
+#include /**/ "ace/pre.h"
+
+#include "imr_client_export.h"
+#include "tao/ImR_Client/ImplRepoC.h"
+
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_decl.cpp:49
+
+extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_AlreadyRegistered;
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_decl.cpp:49
+
+extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_CannotActivate;
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_decl.cpp:49
+
+extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_NotFound;
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_decl.cpp:49
+
+extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_EnvironmentVariable;
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_decl.cpp:49
+
+extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_EnvironmentList;
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_decl.cpp:49
+
+extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_ActivationMode;
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_decl.cpp:49
+
+extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_StartupOptions;
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_decl.cpp:49
+
+extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_ServerInformation;
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_decl.cpp:49
+
+extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_ServerInformationList;
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_decl.cpp:49
+
+extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_ServerInformationIterator;
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_decl.cpp:49
+
+extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_Administration;
+
+// TAO_IDL - Generated from
+// be\be_visitor_exception/any_op_ch.cpp:53
+
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, const ImplementationRepository::AlreadyRegistered &); // copying version
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::AlreadyRegistered*); // noncopying version
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::AlreadyRegistered *&); // deprecated
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::AlreadyRegistered *&);
+
+// TAO_IDL - Generated from
+// be\be_visitor_exception/any_op_ch.cpp:53
+
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, const ImplementationRepository::CannotActivate &); // copying version
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::CannotActivate*); // noncopying version
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::CannotActivate *&); // deprecated
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::CannotActivate *&);
+
+// TAO_IDL - Generated from
+// be\be_visitor_exception/any_op_ch.cpp:53
+
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, const ImplementationRepository::NotFound &); // copying version
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::NotFound*); // noncopying version
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::NotFound *&); // deprecated
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::NotFound *&);
+
+// TAO_IDL - Generated from
+// be\be_visitor_structure/any_op_ch.cpp:53
+
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, const ImplementationRepository::EnvironmentVariable &); // copying version
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::EnvironmentVariable*); // noncopying version
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::EnvironmentVariable *&); // deprecated
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::EnvironmentVariable *&);
+
+// TAO_IDL - Generated from
+// be\be_visitor_sequence/any_op_ch.cpp:53
+
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, const ImplementationRepository::EnvironmentList &); // copying version
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::EnvironmentList*); // noncopying version
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::EnvironmentList *&); // deprecated
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::EnvironmentList *&);
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/any_op_ch.cpp:52
+
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::ActivationMode);
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ActivationMode &);
+
+// TAO_IDL - Generated from
+// be\be_visitor_structure/any_op_ch.cpp:53
+
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, const ImplementationRepository::StartupOptions &); // copying version
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::StartupOptions*); // noncopying version
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::StartupOptions *&); // deprecated
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::StartupOptions *&);
+
+// TAO_IDL - Generated from
+// be\be_visitor_structure/any_op_ch.cpp:53
+
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, const ImplementationRepository::ServerInformation &); // copying version
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformation*); // noncopying version
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerInformation *&); // deprecated
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::ServerInformation *&);
+
+// TAO_IDL - Generated from
+// be\be_visitor_sequence/any_op_ch.cpp:53
+
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, const ImplementationRepository::ServerInformationList &); // copying version
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformationList*); // noncopying version
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerInformationList *&); // deprecated
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::ServerInformationList *&);
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_ch.cpp:53
+
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformationIterator_ptr); // copying
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformationIterator_ptr *); // non-copying
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerInformationIterator_ptr &);
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_ch.cpp:53
+
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration_ptr); // copying
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration_ptr *); // non-copying
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::Administration_ptr &);
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
diff --git a/TAO/tao/ImR_Client/ImplRepoC.cpp b/TAO/tao/ImR_Client/ImplRepoC.cpp
index 62e31a92d1c..68ea6e3b79b 100644
--- a/TAO/tao/ImR_Client/ImplRepoC.cpp
+++ b/TAO/tao/ImR_Client/ImplRepoC.cpp
@@ -58,7 +58,7 @@ namespace TAO
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_CS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_CS_
- 
+
   template<>
   class  Arg_Traits<ImplementationRepository::ServerObject>
     : public
@@ -66,64 +66,68 @@ namespace TAO
             ImplementationRepository::ServerObject_ptr,
             ImplementationRepository::ServerObject_var,
             ImplementationRepository::ServerObject_out,
-            TAO::Objref_Traits<ImplementationRepository::ServerObject>
+            TAO::Objref_Traits<ImplementationRepository::ServerObject>,
+            TAO::Any_Insert_Policy_Stream <ImplementationRepository::ServerObject_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
- 
+
   // TAO_IDL - Generated from
   // .\be\be_visitor_arg_traits.cpp:772
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_CS_)
 #define _IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_CS_
- 
+
   template<>
   class Arg_Traits<ImplementationRepository::StartupOptions>
     : public
         Var_Size_Arg_Traits_T<
             ImplementationRepository::StartupOptions,
             ImplementationRepository::StartupOptions_var,
-            ImplementationRepository::StartupOptions_out
+            ImplementationRepository::StartupOptions_out,
+            TAO::Any_Insert_Policy_Stream <ImplementationRepository::StartupOptions>
           >
   {
   };
 
 #endif /* end #if !defined */
- 
+
   // TAO_IDL - Generated from
   // .\be\be_visitor_arg_traits.cpp:772
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_CS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_CS_
- 
+
   template<>
   class Arg_Traits<ImplementationRepository::ServerInformation>
     : public
         Var_Size_Arg_Traits_T<
             ImplementationRepository::ServerInformation,
             ImplementationRepository::ServerInformation_var,
-            ImplementationRepository::ServerInformation_out
+            ImplementationRepository::ServerInformation_out,
+            TAO::Any_Insert_Policy_Stream <ImplementationRepository::ServerInformation>
           >
   {
   };
 
 #endif /* end #if !defined */
- 
+
   // TAO_IDL - Generated from
   // .\be\be_visitor_arg_traits.cpp:489
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_CS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_CS_
- 
+
   template<>
   class Arg_Traits<ImplementationRepository::ServerInformationList>
     : public
         Var_Size_Arg_Traits_T<
             ImplementationRepository::ServerInformationList,
             ImplementationRepository::ServerInformationList_var,
-            ImplementationRepository::ServerInformationList_out
+            ImplementationRepository::ServerInformationList_out,
+            TAO::Any_Insert_Policy_Stream <ImplementationRepository::ServerInformationList>
           >
   {
   };
@@ -132,7 +136,7 @@ namespace TAO
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_CS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_CS_
- 
+
   template<>
   class  Arg_Traits<ImplementationRepository::ServerInformationIterator>
     : public
@@ -140,7 +144,8 @@ namespace TAO
             ImplementationRepository::ServerInformationIterator_ptr,
             ImplementationRepository::ServerInformationIterator_var,
             ImplementationRepository::ServerInformationIterator_out,
-            TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>
+            TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>,
+            TAO::Any_Insert_Policy_Stream <ImplementationRepository::ServerInformationIterator_ptr>
           >
   {
   };
diff --git a/TAO/tao/ImR_Client/ImplRepoS.cpp b/TAO/tao/ImR_Client/ImplRepoS.cpp
index 3df3311909e..de4c1dca776 100644
--- a/TAO/tao/ImR_Client/ImplRepoS.cpp
+++ b/TAO/tao/ImR_Client/ImplRepoS.cpp
@@ -54,8 +54,8 @@
 #include "tao/Stub.h"
 #include "tao/IFR_Client_Adapter.h"
 #include "tao/Object_T.h"
-#include "tao/TypeCode.h"
-#include "tao/DynamicC.h"
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/AnyTypeCode/DynamicC.h"
 #include "tao/CDR.h"
 #include "tao/operation_details.h"
 #include "tao/PortableInterceptor.h"
@@ -80,71 +80,75 @@ namespace TAO
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT__SARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__SARG_TRAITS_SS_
- 
+
   template<>
   class  SArg_Traits<ImplementationRepository::ServerObject>
     : public
         Object_SArg_Traits_T<
             ImplementationRepository::ServerObject_ptr,
             ImplementationRepository::ServerObject_var,
-            ImplementationRepository::ServerObject_out
+            ImplementationRepository::ServerObject_out,
+            TAO::Any_Insert_Policy_Stream <ImplementationRepository::ServerObject_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
- 
+
   // TAO_IDL - Generated from
   // .\be\be_visitor_arg_traits.cpp:772
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__SARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__SARG_TRAITS_SS_
- 
+
   template<>
   class SArg_Traits<ImplementationRepository::StartupOptions>
     : public
         Var_Size_SArg_Traits_T<
             ImplementationRepository::StartupOptions,
             ImplementationRepository::StartupOptions_var,
-            ImplementationRepository::StartupOptions_out
+            ImplementationRepository::StartupOptions_out,
+            TAO::Any_Insert_Policy_Stream <ImplementationRepository::StartupOptions>
           >
   {
   };
 
 #endif /* end #if !defined */
- 
+
   // TAO_IDL - Generated from
   // .\be\be_visitor_arg_traits.cpp:772
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__SARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__SARG_TRAITS_SS_
- 
+
   template<>
   class SArg_Traits<ImplementationRepository::ServerInformation>
     : public
         Var_Size_SArg_Traits_T<
             ImplementationRepository::ServerInformation,
             ImplementationRepository::ServerInformation_var,
-            ImplementationRepository::ServerInformation_out
+            ImplementationRepository::ServerInformation_out,
+            TAO::Any_Insert_Policy_Stream <ImplementationRepository::ServerInformation>
           >
   {
   };
 
 #endif /* end #if !defined */
- 
+
   // TAO_IDL - Generated from
   // .\be\be_visitor_arg_traits.cpp:489
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__SARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__SARG_TRAITS_SS_
- 
+
   template<>
   class SArg_Traits<ImplementationRepository::ServerInformationList>
     : public
         Var_Size_SArg_Traits_T<
             ImplementationRepository::ServerInformationList,
             ImplementationRepository::ServerInformationList_var,
-            ImplementationRepository::ServerInformationList_out
+            ImplementationRepository::ServerInformationList_out,
+            TAO::Any_Insert_Policy_Stream <ImplementationRepository::ServerInformationList>
           >
   {
   };
@@ -153,14 +157,15 @@ namespace TAO
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__SARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__SARG_TRAITS_SS_
- 
+
   template<>
   class  SArg_Traits<ImplementationRepository::ServerInformationIterator>
     : public
         Object_SArg_Traits_T<
             ImplementationRepository::ServerInformationIterator_ptr,
             ImplementationRepository::ServerInformationIterator_var,
-            ImplementationRepository::ServerInformationIterator_out
+            ImplementationRepository::ServerInformationIterator_out,
+            TAO::Any_Insert_Policy_Stream <ImplementationRepository::ServerInformationIterator_ptr>
           >
   {
   };
@@ -178,7 +183,7 @@ namespace TAO
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_SS_
- 
+
   template<>
   class  Arg_Traits<ImplementationRepository::ServerObject>
     : public
@@ -186,64 +191,68 @@ namespace TAO
             ImplementationRepository::ServerObject_ptr,
             ImplementationRepository::ServerObject_var,
             ImplementationRepository::ServerObject_out,
-            TAO::Objref_Traits<ImplementationRepository::ServerObject>
+            TAO::Objref_Traits<ImplementationRepository::ServerObject>,
+            TAO::Any_Insert_Policy_Stream <ImplementationRepository::ServerObject>
           >
   {
   };
 
 #endif /* end #if !defined */
- 
+
   // TAO_IDL - Generated from
   // .\be\be_visitor_arg_traits.cpp:772
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_SS_
- 
+
   template<>
   class Arg_Traits<ImplementationRepository::StartupOptions>
     : public
         Var_Size_Arg_Traits_T<
             ImplementationRepository::StartupOptions,
             ImplementationRepository::StartupOptions_var,
-            ImplementationRepository::StartupOptions_out
+            ImplementationRepository::StartupOptions_out,
+            TAO::Any_Insert_Policy_Stream <ImplementationRepository::StartupOptions>
           >
   {
   };
 
 #endif /* end #if !defined */
- 
+
   // TAO_IDL - Generated from
   // .\be\be_visitor_arg_traits.cpp:772
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_SS_
- 
+
   template<>
   class Arg_Traits<ImplementationRepository::ServerInformation>
     : public
         Var_Size_Arg_Traits_T<
             ImplementationRepository::ServerInformation,
             ImplementationRepository::ServerInformation_var,
-            ImplementationRepository::ServerInformation_out
+            ImplementationRepository::ServerInformation_out,
+            TAO::Any_Insert_Policy_Stream <ImplementationRepository::ServerInformation>
           >
   {
   };
 
 #endif /* end #if !defined */
- 
+
   // TAO_IDL - Generated from
   // .\be\be_visitor_arg_traits.cpp:489
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_SS_
- 
+
   template<>
   class Arg_Traits<ImplementationRepository::ServerInformationList>
     : public
         Var_Size_Arg_Traits_T<
             ImplementationRepository::ServerInformationList,
             ImplementationRepository::ServerInformationList_var,
-            ImplementationRepository::ServerInformationList_out
+            ImplementationRepository::ServerInformationList_out,
+            TAO::Any_Insert_Policy_Stream <ImplementationRepository::ServerInformation>
           >
   {
   };
@@ -252,7 +261,7 @@ namespace TAO
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_SS_
- 
+
   template<>
   class  Arg_Traits<ImplementationRepository::ServerInformationIterator>
     : public
@@ -260,7 +269,8 @@ namespace TAO
             ImplementationRepository::ServerInformationIterator_ptr,
             ImplementationRepository::ServerInformationIterator_var,
             ImplementationRepository::ServerInformationIterator_out,
-            TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>
+            TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>,
+            TAO::Any_Insert_Policy_Stream <ImplementationRepository::ServerInformationIterator_ptr>
           >
   {
   };
@@ -393,7 +403,7 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_B
 {
   static POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker
   strategized_proxy_broker;
- 
+
   return &strategized_proxy_broker;
 }
 
@@ -415,7 +425,7 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_B
   TAO::Collocation_Strategy strategy =
     TAO_ORB_Core::collocation_strategy (obj ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (TAO::TAO_CS_REMOTE_STRATEGY);
- 
+
   return strategy;
 }
 
@@ -463,7 +473,7 @@ ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_Ini
 {
   ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer =
     ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function;
- 
+
   return 0;
 }
 
@@ -553,11 +563,11 @@ POA_ImplementationRepository::ServerInformationIterator::~ServerInformationItera
 }
 namespace POA_ImplementationRepository
 {
- 
- 
+
+
   // TAO_IDL - Generated from
   // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
- 
+
   class next_n_ServerInformationIterator
     : public TAO::Upcall_Command
   {
@@ -571,41 +581,41 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
- 
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
- 
+
       TAO::SArg_Traits< ::CORBA::ULong>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::ULong, TAO::SArg_Traits< ::CORBA::ULong>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
- 
+
       TAO::SArg_Traits< ::ImplementationRepository::ServerInformationList>::out_arg_type arg_2 =
         TAO::Portable_Server::get_out_arg< ::ImplementationRepository::ServerInformationList, TAO::SArg_Traits< ::ImplementationRepository::ServerInformationList>::out_arg_type> (
           this->operation_details_,
           this->args_,
           2);
- 
- 
+
+
       retval =
         this->servant_->next_n (
           arg_1
           , arg_2
           ACE_ENV_ARG_PARAMETER);
- 
+
     }
- 
+
   private:
     POA_ImplementationRepository::ServerInformationIterator * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
- 
+
 }
 
 
@@ -619,26 +629,26 @@ void POA_ImplementationRepository::ServerInformationIterator::next_n_skel (
     ACE_ENV_ARG_DECL
   )
 {
- 
- 
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
- 
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::ULong>::in_arg_val _tao_how_many;
   TAO::SArg_Traits< ::ImplementationRepository::ServerInformationList>::out_arg_val _tao_servers;
- 
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_how_many,
       &_tao_servers
     };
- 
+
   static size_t const nargs = 3;
- 
+
   POA_ImplementationRepository::ServerInformationIterator * const impl =
     static_cast<POA_ImplementationRepository::ServerInformationIterator *> (servant);
 
@@ -646,7 +656,7 @@ void POA_ImplementationRepository::ServerInformationIterator::next_n_skel (
     impl,
     server_request.operation_details (),
     args);
- 
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -659,15 +669,15 @@ void POA_ImplementationRepository::ServerInformationIterator::next_n_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
- 
+
 }
 namespace POA_ImplementationRepository
 {
- 
- 
+
+
   // TAO_IDL - Generated from
   // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
- 
+
   class destroy_ServerInformationIterator
     : public TAO::Upcall_Command
   {
@@ -677,18 +687,18 @@ namespace POA_ImplementationRepository
       : servant_ (servant)
     {
     }
- 
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       this->servant_->destroy (
         ACE_ENV_SINGLE_ARG_PARAMETER);
- 
+
     }
- 
+
   private:
     POA_ImplementationRepository::ServerInformationIterator * const servant_;
   };
- 
+
 }
 
 
@@ -702,28 +712,28 @@ void POA_ImplementationRepository::ServerInformationIterator::destroy_skel (
     ACE_ENV_ARG_DECL
   )
 {
- 
- 
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
- 
+
   TAO::SArg_Traits< void>::ret_val retval;
- 
+
   TAO::Argument * const args[] =
     {
       &retval
     };
- 
+
   static size_t const nargs = 1;
- 
+
   POA_ImplementationRepository::ServerInformationIterator * const impl =
     static_cast<POA_ImplementationRepository::ServerInformationIterator *> (servant);
 
   destroy_ServerInformationIterator command (
     impl);
- 
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -736,7 +746,7 @@ void POA_ImplementationRepository::ServerInformationIterator::destroy_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
- 
+
 }
 
 // TAO_IDL - Generated from
@@ -744,11 +754,11 @@ void POA_ImplementationRepository::ServerInformationIterator::destroy_skel (
 
 namespace POA_ImplementationRepository
 {
- 
- 
+
+
   // TAO_IDL - Generated from
   // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
- 
+
   class _is_a_ServerInformationIterator_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -762,34 +772,34 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
- 
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
- 
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
- 
- 
+
+
       retval =
         this->servant_-> _is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
- 
+
     }
- 
+
   private:
     POA_ImplementationRepository::ServerInformationIterator * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
- 
+
 }
 void POA_ImplementationRepository::ServerInformationIterator::_is_a_skel (
     TAO_ServerRequest & server_request,
@@ -798,32 +808,32 @@ void POA_ImplementationRepository::ServerInformationIterator::_is_a_skel (
     ACE_ENV_ARG_DECL
   )
 {
- 
- 
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
- 
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
- 
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
- 
+
   static size_t const nargs = 2;
- 
+
   POA_ImplementationRepository::ServerInformationIterator * const impl =
     static_cast<POA_ImplementationRepository::ServerInformationIterator *> (servant);
- 
+
   _is_a_ServerInformationIterator_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
- 
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -836,16 +846,16 @@ void POA_ImplementationRepository::ServerInformationIterator::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
- 
+
 }
 
 namespace POA_ImplementationRepository
 {
- 
- 
+
+
   // TAO_IDL - Generated from
   // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
- 
+
   class _non_existent_ServerInformationIterator_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -859,27 +869,27 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
- 
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
- 
- 
+
+
       retval =
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
- 
+
     }
- 
+
   private:
     POA_ImplementationRepository::ServerInformationIterator * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
- 
+
 }
 void POA_ImplementationRepository::ServerInformationIterator::_non_existent_skel (
     TAO_ServerRequest & server_request,
@@ -888,30 +898,30 @@ void POA_ImplementationRepository::ServerInformationIterator::_non_existent_skel
     ACE_ENV_ARG_DECL
   )
 {
- 
- 
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
- 
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
- 
+
   TAO::Argument * const args[] =
     {
       &retval
     };
- 
+
   static size_t const nargs = 1;
- 
+
   POA_ImplementationRepository::ServerInformationIterator * const impl =
     static_cast<POA_ImplementationRepository::ServerInformationIterator *> (servant);
- 
+
   _non_existent_ServerInformationIterator_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
- 
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -924,7 +934,7 @@ void POA_ImplementationRepository::ServerInformationIterator::_non_existent_skel
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
- 
+
 }
 
 
@@ -945,30 +955,30 @@ void POA_ImplementationRepository::ServerInformationIterator::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
- 
+
   if (_tao_adapter == 0)
     {
       ACE_THROW (CORBA::INTF_REPOS (CORBA::OMGVMCID | 1,
                                     CORBA::COMPLETED_NO));
     }
- 
+
   POA_ImplementationRepository::ServerInformationIterator * const impl =
     static_cast<POA_ImplementationRepository::ServerInformationIterator *> (servant);
   CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
- 
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
- 
+
   CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
- 
+
   _tao_adapter->dispose (_tao_retval);
- 
+
   if (_tao_result == 0)
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -977,11 +987,11 @@ void POA_ImplementationRepository::ServerInformationIterator::_interface_skel (
 
 namespace POA_ImplementationRepository
 {
- 
- 
+
+
   // TAO_IDL - Generated from
   // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
- 
+
   class _get_component_ServerInformationIterator_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -995,27 +1005,27 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
- 
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
           this->operation_details_,
           this->args_);
- 
- 
+
+
       retval =
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
- 
+
     }
- 
+
   private:
     POA_ImplementationRepository::ServerInformationIterator * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
- 
+
 }
 void POA_ImplementationRepository::ServerInformationIterator::_component_skel (
     TAO_ServerRequest & server_request,
@@ -1024,30 +1034,30 @@ void POA_ImplementationRepository::ServerInformationIterator::_component_skel (
     ACE_ENV_ARG_DECL
   )
 {
- 
- 
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
- 
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
- 
+
   TAO::Argument * const args[] =
     {
       &retval
     };
- 
+
   static size_t const nargs = 1;
- 
+
   POA_ImplementationRepository::ServerInformationIterator * const impl =
     static_cast<POA_ImplementationRepository::ServerInformationIterator *> (servant);
- 
+
   _get_component_ServerInformationIterator_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
- 
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1060,7 +1070,7 @@ void POA_ImplementationRepository::ServerInformationIterator::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
- 
+
 }
 
 CORBA::Boolean POA_ImplementationRepository::ServerInformationIterator::_is_a (
@@ -1109,22 +1119,22 @@ POA_ImplementationRepository::ServerInformationIterator::_this (ACE_ENV_SINGLE_A
 {
   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 ();
- 
+
   CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
- 
+
   ACE_NEW_RETURN (
       tmp,
       CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
- 
+
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
- 
+
   typedef ::ImplementationRepository::ServerInformationIterator STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -1267,7 +1277,7 @@ POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::the_
 {
   static POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker
   strategized_proxy_broker;
- 
+
   return &strategized_proxy_broker;
 }
 
@@ -1289,7 +1299,7 @@ POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::get_
   TAO::Collocation_Strategy strategy =
     TAO_ORB_Core::collocation_strategy (obj ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (TAO::TAO_CS_REMOTE_STRATEGY);
- 
+
   return strategy;
 }
 
@@ -1337,7 +1347,7 @@ ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_Initializer (s
 {
   ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer =
     ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function;
- 
+
   return 0;
 }
 
@@ -1594,11 +1604,11 @@ POA_ImplementationRepository::Administration::~Administration (void)
 }
 namespace POA_ImplementationRepository
 {
- 
- 
+
+
   // TAO_IDL - Generated from
   // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
- 
+
   class activate_server_Administration
     : public TAO::Upcall_Command
   {
@@ -1612,7 +1622,7 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
- 
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
@@ -1620,19 +1630,19 @@ namespace POA_ImplementationRepository
           this->operation_details_,
           this->args_,
           1);
- 
+
       this->servant_->activate_server (
         arg_1
         ACE_ENV_ARG_PARAMETER);
- 
+
     }
- 
+
   private:
     POA_ImplementationRepository::Administration * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
- 
+
 }
 
 
@@ -1646,8 +1656,8 @@ void POA_ImplementationRepository::Administration::activate_server_skel (
     ACE_ENV_ARG_DECL
   )
 {
- 
- 
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const exceptions[] =
     {
@@ -1656,18 +1666,18 @@ void POA_ImplementationRepository::Administration::activate_server_skel (
     };
   static size_t const nexceptions = 2;
 #endif /* TAO_HAS_INTERCEPTORS */
- 
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_server;
- 
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_server
     };
- 
+
   static size_t const nargs = 2;
- 
+
   POA_ImplementationRepository::Administration * const impl =
     static_cast<POA_ImplementationRepository::Administration *> (servant);
 
@@ -1675,7 +1685,7 @@ void POA_ImplementationRepository::Administration::activate_server_skel (
     impl,
     server_request.operation_details (),
     args);
- 
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1688,15 +1698,15 @@ void POA_ImplementationRepository::Administration::activate_server_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
- 
+
 }
 namespace POA_ImplementationRepository
 {
- 
- 
+
+
   // TAO_IDL - Generated from
   // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
- 
+
   class add_or_update_server_Administration
     : public TAO::Upcall_Command
   {
@@ -1710,7 +1720,7 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
- 
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
@@ -1718,26 +1728,26 @@ namespace POA_ImplementationRepository
           this->operation_details_,
           this->args_,
           1);
- 
+
       TAO::SArg_Traits< ::ImplementationRepository::StartupOptions>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::ImplementationRepository::StartupOptions, TAO::SArg_Traits< ::ImplementationRepository::StartupOptions>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
- 
+
       this->servant_->add_or_update_server (
         arg_1
         , arg_2
         ACE_ENV_ARG_PARAMETER);
- 
+
     }
- 
+
   private:
     POA_ImplementationRepository::Administration * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
- 
+
 }
 
 
@@ -1751,8 +1761,8 @@ void POA_ImplementationRepository::Administration::add_or_update_server_skel (
     ACE_ENV_ARG_DECL
   )
 {
- 
- 
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const exceptions[] =
     {
@@ -1760,20 +1770,20 @@ void POA_ImplementationRepository::Administration::add_or_update_server_skel (
     };
   static size_t const nexceptions = 1;
 #endif /* TAO_HAS_INTERCEPTORS */
- 
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_server;
   TAO::SArg_Traits< ::ImplementationRepository::StartupOptions>::in_arg_val _tao_options;
- 
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_server,
       &_tao_options
     };
- 
+
   static size_t const nargs = 3;
- 
+
   POA_ImplementationRepository::Administration * const impl =
     static_cast<POA_ImplementationRepository::Administration *> (servant);
 
@@ -1781,7 +1791,7 @@ void POA_ImplementationRepository::Administration::add_or_update_server_skel (
     impl,
     server_request.operation_details (),
     args);
- 
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1794,15 +1804,15 @@ void POA_ImplementationRepository::Administration::add_or_update_server_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
- 
+
 }
 namespace POA_ImplementationRepository
 {
- 
- 
+
+
   // TAO_IDL - Generated from
   // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
- 
+
   class remove_server_Administration
     : public TAO::Upcall_Command
   {
@@ -1816,7 +1826,7 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
- 
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
@@ -1824,19 +1834,19 @@ namespace POA_ImplementationRepository
           this->operation_details_,
           this->args_,
           1);
- 
+
       this->servant_->remove_server (
         arg_1
         ACE_ENV_ARG_PARAMETER);
- 
+
     }
- 
+
   private:
     POA_ImplementationRepository::Administration * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
- 
+
 }
 
 
@@ -1850,8 +1860,8 @@ void POA_ImplementationRepository::Administration::remove_server_skel (
     ACE_ENV_ARG_DECL
   )
 {
- 
- 
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const exceptions[] =
     {
@@ -1859,18 +1869,18 @@ void POA_ImplementationRepository::Administration::remove_server_skel (
     };
   static size_t const nexceptions = 1;
 #endif /* TAO_HAS_INTERCEPTORS */
- 
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_server;
- 
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_server
     };
- 
+
   static size_t const nargs = 2;
- 
+
   POA_ImplementationRepository::Administration * const impl =
     static_cast<POA_ImplementationRepository::Administration *> (servant);
 
@@ -1878,7 +1888,7 @@ void POA_ImplementationRepository::Administration::remove_server_skel (
     impl,
     server_request.operation_details (),
     args);
- 
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1891,15 +1901,15 @@ void POA_ImplementationRepository::Administration::remove_server_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
- 
+
 }
 namespace POA_ImplementationRepository
 {
- 
- 
+
+
   // TAO_IDL - Generated from
   // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
- 
+
   class shutdown_server_Administration
     : public TAO::Upcall_Command
   {
@@ -1913,7 +1923,7 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
- 
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
@@ -1921,19 +1931,19 @@ namespace POA_ImplementationRepository
           this->operation_details_,
           this->args_,
           1);
- 
+
       this->servant_->shutdown_server (
         arg_1
         ACE_ENV_ARG_PARAMETER);
- 
+
     }
- 
+
   private:
     POA_ImplementationRepository::Administration * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
- 
+
 }
 
 
@@ -1947,8 +1957,8 @@ void POA_ImplementationRepository::Administration::shutdown_server_skel (
     ACE_ENV_ARG_DECL
   )
 {
- 
- 
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const exceptions[] =
     {
@@ -1956,18 +1966,18 @@ void POA_ImplementationRepository::Administration::shutdown_server_skel (
     };
   static size_t const nexceptions = 1;
 #endif /* TAO_HAS_INTERCEPTORS */
- 
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_server;
- 
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_server
     };
- 
+
   static size_t const nargs = 2;
- 
+
   POA_ImplementationRepository::Administration * const impl =
     static_cast<POA_ImplementationRepository::Administration *> (servant);
 
@@ -1975,7 +1985,7 @@ void POA_ImplementationRepository::Administration::shutdown_server_skel (
     impl,
     server_request.operation_details (),
     args);
- 
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1988,15 +1998,15 @@ void POA_ImplementationRepository::Administration::shutdown_server_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
- 
+
 }
 namespace POA_ImplementationRepository
 {
- 
- 
+
+
   // TAO_IDL - Generated from
   // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
- 
+
   class server_is_running_Administration
     : public TAO::Upcall_Command
   {
@@ -2010,7 +2020,7 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
- 
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
@@ -2018,33 +2028,33 @@ namespace POA_ImplementationRepository
           this->operation_details_,
           this->args_,
           1);
- 
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
- 
+
       TAO::SArg_Traits< ::ImplementationRepository::ServerObject>::in_arg_type arg_3 =
         TAO::Portable_Server::get_in_arg< ::ImplementationRepository::ServerObject, TAO::SArg_Traits< ::ImplementationRepository::ServerObject>::in_arg_type> (
           this->operation_details_,
           this->args_,
           3);
- 
+
       this->servant_->server_is_running (
         arg_1
         , arg_2
         , arg_3
         ACE_ENV_ARG_PARAMETER);
- 
+
     }
- 
+
   private:
     POA_ImplementationRepository::Administration * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
- 
+
 }
 
 
@@ -2058,8 +2068,8 @@ void POA_ImplementationRepository::Administration::server_is_running_skel (
     ACE_ENV_ARG_DECL
   )
 {
- 
- 
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const exceptions[] =
     {
@@ -2067,12 +2077,12 @@ void POA_ImplementationRepository::Administration::server_is_running_skel (
     };
   static size_t const nexceptions = 1;
 #endif /* TAO_HAS_INTERCEPTORS */
- 
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_server;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_partial_ior;
   TAO::SArg_Traits< ::ImplementationRepository::ServerObject>::in_arg_val _tao_server_object;
- 
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -2080,9 +2090,9 @@ void POA_ImplementationRepository::Administration::server_is_running_skel (
       &_tao_partial_ior,
       &_tao_server_object
     };
- 
+
   static size_t const nargs = 4;
- 
+
   POA_ImplementationRepository::Administration * const impl =
     static_cast<POA_ImplementationRepository::Administration *> (servant);
 
@@ -2090,7 +2100,7 @@ void POA_ImplementationRepository::Administration::server_is_running_skel (
     impl,
     server_request.operation_details (),
     args);
- 
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2103,15 +2113,15 @@ void POA_ImplementationRepository::Administration::server_is_running_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
- 
+
 }
 namespace POA_ImplementationRepository
 {
- 
- 
+
+
   // TAO_IDL - Generated from
   // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
- 
+
   class server_is_shutting_down_Administration
     : public TAO::Upcall_Command
   {
@@ -2125,7 +2135,7 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
- 
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
@@ -2133,19 +2143,19 @@ namespace POA_ImplementationRepository
           this->operation_details_,
           this->args_,
           1);
- 
+
       this->servant_->server_is_shutting_down (
         arg_1
         ACE_ENV_ARG_PARAMETER);
- 
+
     }
- 
+
   private:
     POA_ImplementationRepository::Administration * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
- 
+
 }
 
 
@@ -2159,8 +2169,8 @@ void POA_ImplementationRepository::Administration::server_is_shutting_down_skel
     ACE_ENV_ARG_DECL
   )
 {
- 
- 
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const exceptions[] =
     {
@@ -2168,18 +2178,18 @@ void POA_ImplementationRepository::Administration::server_is_shutting_down_skel
     };
   static size_t const nexceptions = 1;
 #endif /* TAO_HAS_INTERCEPTORS */
- 
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_server;
- 
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_server
     };
- 
+
   static size_t const nargs = 2;
- 
+
   POA_ImplementationRepository::Administration * const impl =
     static_cast<POA_ImplementationRepository::Administration *> (servant);
 
@@ -2187,7 +2197,7 @@ void POA_ImplementationRepository::Administration::server_is_shutting_down_skel
     impl,
     server_request.operation_details (),
     args);
- 
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2200,15 +2210,15 @@ void POA_ImplementationRepository::Administration::server_is_shutting_down_skel
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
- 
+
 }
 namespace POA_ImplementationRepository
 {
- 
- 
+
+
   // TAO_IDL - Generated from
   // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
- 
+
   class find_Administration
     : public TAO::Upcall_Command
   {
@@ -2222,7 +2232,7 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
- 
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
@@ -2230,26 +2240,26 @@ namespace POA_ImplementationRepository
           this->operation_details_,
           this->args_,
           1);
- 
+
       TAO::SArg_Traits< ::ImplementationRepository::ServerInformation>::out_arg_type arg_2 =
         TAO::Portable_Server::get_out_arg< ::ImplementationRepository::ServerInformation, TAO::SArg_Traits< ::ImplementationRepository::ServerInformation>::out_arg_type> (
           this->operation_details_,
           this->args_,
           2);
- 
+
       this->servant_->find (
         arg_1
         , arg_2
         ACE_ENV_ARG_PARAMETER);
- 
+
     }
- 
+
   private:
     POA_ImplementationRepository::Administration * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
- 
+
 }
 
 
@@ -2263,26 +2273,26 @@ void POA_ImplementationRepository::Administration::find_skel (
     ACE_ENV_ARG_DECL
   )
 {
- 
- 
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
- 
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_server;
   TAO::SArg_Traits< ::ImplementationRepository::ServerInformation>::out_arg_val _tao_info;
- 
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_server,
       &_tao_info
     };
- 
+
   static size_t const nargs = 3;
- 
+
   POA_ImplementationRepository::Administration * const impl =
     static_cast<POA_ImplementationRepository::Administration *> (servant);
 
@@ -2290,7 +2300,7 @@ void POA_ImplementationRepository::Administration::find_skel (
     impl,
     server_request.operation_details (),
     args);
- 
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2303,15 +2313,15 @@ void POA_ImplementationRepository::Administration::find_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
- 
+
 }
 namespace POA_ImplementationRepository
 {
- 
- 
+
+
   // TAO_IDL - Generated from
   // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
- 
+
   class list_Administration
     : public TAO::Upcall_Command
   {
@@ -2325,7 +2335,7 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
- 
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::ULong>::in_arg_type arg_1 =
@@ -2333,33 +2343,33 @@ namespace POA_ImplementationRepository
           this->operation_details_,
           this->args_,
           1);
- 
+
       TAO::SArg_Traits< ::ImplementationRepository::ServerInformationList>::out_arg_type arg_2 =
         TAO::Portable_Server::get_out_arg< ::ImplementationRepository::ServerInformationList, TAO::SArg_Traits< ::ImplementationRepository::ServerInformationList>::out_arg_type> (
           this->operation_details_,
           this->args_,
           2);
- 
+
       TAO::SArg_Traits< ::ImplementationRepository::ServerInformationIterator>::out_arg_type arg_3 =
         TAO::Portable_Server::get_out_arg< ::ImplementationRepository::ServerInformationIterator, TAO::SArg_Traits< ::ImplementationRepository::ServerInformationIterator>::out_arg_type> (
           this->operation_details_,
           this->args_,
           3);
- 
+
       this->servant_->list (
         arg_1
         , arg_2
         , arg_3
         ACE_ENV_ARG_PARAMETER);
- 
+
     }
- 
+
   private:
     POA_ImplementationRepository::Administration * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
- 
+
 }
 
 
@@ -2373,18 +2383,18 @@ void POA_ImplementationRepository::Administration::list_skel (
     ACE_ENV_ARG_DECL
   )
 {
- 
- 
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
- 
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::ULong>::in_arg_val _tao_how_many;
   TAO::SArg_Traits< ::ImplementationRepository::ServerInformationList>::out_arg_val _tao_server_list;
   TAO::SArg_Traits< ::ImplementationRepository::ServerInformationIterator>::out_arg_val _tao_server_iterator;
- 
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -2392,9 +2402,9 @@ void POA_ImplementationRepository::Administration::list_skel (
       &_tao_server_list,
       &_tao_server_iterator
     };
- 
+
   static size_t const nargs = 4;
- 
+
   POA_ImplementationRepository::Administration * const impl =
     static_cast<POA_ImplementationRepository::Administration *> (servant);
 
@@ -2402,7 +2412,7 @@ void POA_ImplementationRepository::Administration::list_skel (
     impl,
     server_request.operation_details (),
     args);
- 
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2415,15 +2425,15 @@ void POA_ImplementationRepository::Administration::list_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
- 
+
 }
 namespace POA_ImplementationRepository
 {
- 
- 
+
+
   // TAO_IDL - Generated from
   // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
- 
+
   class shutdown_Administration
     : public TAO::Upcall_Command
   {
@@ -2437,7 +2447,7 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
- 
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_1 =
@@ -2445,26 +2455,26 @@ namespace POA_ImplementationRepository
           this->operation_details_,
           this->args_,
           1);
- 
+
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
- 
+
       this->servant_->shutdown (
         arg_1
         , arg_2
         ACE_ENV_ARG_PARAMETER);
- 
+
     }
- 
+
   private:
     POA_ImplementationRepository::Administration * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
- 
+
 }
 
 
@@ -2478,26 +2488,26 @@ void POA_ImplementationRepository::Administration::shutdown_skel (
     ACE_ENV_ARG_DECL
   )
 {
- 
- 
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
- 
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_activators;
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_servers;
- 
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_activators,
       &_tao_servers
     };
- 
+
   static size_t const nargs = 3;
- 
+
   POA_ImplementationRepository::Administration * const impl =
     static_cast<POA_ImplementationRepository::Administration *> (servant);
 
@@ -2505,7 +2515,7 @@ void POA_ImplementationRepository::Administration::shutdown_skel (
     impl,
     server_request.operation_details (),
     args);
- 
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2518,7 +2528,7 @@ void POA_ImplementationRepository::Administration::shutdown_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
- 
+
 }
 
 // TAO_IDL - Generated from
@@ -2526,11 +2536,11 @@ void POA_ImplementationRepository::Administration::shutdown_skel (
 
 namespace POA_ImplementationRepository
 {
- 
- 
+
+
   // TAO_IDL - Generated from
   // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
- 
+
   class _is_a_Administration_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -2544,34 +2554,34 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
- 
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
- 
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
- 
- 
+
+
       retval =
         this->servant_-> _is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
- 
+
     }
- 
+
   private:
     POA_ImplementationRepository::Administration * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
- 
+
 }
 void POA_ImplementationRepository::Administration::_is_a_skel (
     TAO_ServerRequest & server_request,
@@ -2580,32 +2590,32 @@ void POA_ImplementationRepository::Administration::_is_a_skel (
     ACE_ENV_ARG_DECL
   )
 {
- 
- 
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
- 
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
- 
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
- 
+
   static size_t const nargs = 2;
- 
+
   POA_ImplementationRepository::Administration * const impl =
     static_cast<POA_ImplementationRepository::Administration *> (servant);
- 
+
   _is_a_Administration_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
- 
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2618,16 +2628,16 @@ void POA_ImplementationRepository::Administration::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
- 
+
 }
 
 namespace POA_ImplementationRepository
 {
- 
- 
+
+
   // TAO_IDL - Generated from
   // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
- 
+
   class _non_existent_Administration_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -2641,27 +2651,27 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
- 
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
- 
- 
+
+
       retval =
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
- 
+
     }
- 
+
   private:
     POA_ImplementationRepository::Administration * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
- 
+
 }
 void POA_ImplementationRepository::Administration::_non_existent_skel (
     TAO_ServerRequest & server_request,
@@ -2670,30 +2680,30 @@ void POA_ImplementationRepository::Administration::_non_existent_skel (
     ACE_ENV_ARG_DECL
   )
 {
- 
- 
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
- 
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
- 
+
   TAO::Argument * const args[] =
     {
       &retval
     };
- 
+
   static size_t const nargs = 1;
- 
+
   POA_ImplementationRepository::Administration * const impl =
     static_cast<POA_ImplementationRepository::Administration *> (servant);
- 
+
   _non_existent_Administration_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
- 
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2706,7 +2716,7 @@ void POA_ImplementationRepository::Administration::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
- 
+
 }
 
 
@@ -2727,30 +2737,30 @@ void POA_ImplementationRepository::Administration::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
- 
+
   if (_tao_adapter == 0)
     {
       ACE_THROW (CORBA::INTF_REPOS (CORBA::OMGVMCID | 1,
                                     CORBA::COMPLETED_NO));
     }
- 
+
   POA_ImplementationRepository::Administration * const impl =
     static_cast<POA_ImplementationRepository::Administration *> (servant);
   CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
- 
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
- 
+
   CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
- 
+
   _tao_adapter->dispose (_tao_retval);
- 
+
   if (_tao_result == 0)
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -2759,11 +2769,11 @@ void POA_ImplementationRepository::Administration::_interface_skel (
 
 namespace POA_ImplementationRepository
 {
- 
- 
+
+
   // TAO_IDL - Generated from
   // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
- 
+
   class _get_component_Administration_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -2777,27 +2787,27 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
- 
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
           this->operation_details_,
           this->args_);
- 
- 
+
+
       retval =
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
- 
+
     }
- 
+
   private:
     POA_ImplementationRepository::Administration * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
- 
+
 }
 void POA_ImplementationRepository::Administration::_component_skel (
     TAO_ServerRequest & server_request,
@@ -2806,30 +2816,30 @@ void POA_ImplementationRepository::Administration::_component_skel (
     ACE_ENV_ARG_DECL
   )
 {
- 
- 
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
- 
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
- 
+
   TAO::Argument * const args[] =
     {
       &retval
     };
- 
+
   static size_t const nargs = 1;
- 
+
   POA_ImplementationRepository::Administration * const impl =
     static_cast<POA_ImplementationRepository::Administration *> (servant);
- 
+
   _get_component_Administration_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
- 
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2842,7 +2852,7 @@ void POA_ImplementationRepository::Administration::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
- 
+
 }
 
 CORBA::Boolean POA_ImplementationRepository::Administration::_is_a (
@@ -2891,22 +2901,22 @@ POA_ImplementationRepository::Administration::_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 ();
- 
+
   CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
- 
+
   ACE_NEW_RETURN (
       tmp,
       CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
- 
+
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
- 
+
   typedef ::ImplementationRepository::Administration STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
diff --git a/TAO/tao/ImR_Client/ServerObjectA.cpp b/TAO/tao/ImR_Client/ServerObjectA.cpp
index 153a0c83393..fcc9fb5f011 100644
--- a/TAO/tao/ImR_Client/ServerObjectA.cpp
+++ b/TAO/tao/ImR_Client/ServerObjectA.cpp
@@ -26,13 +26,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "ServerObjectC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
 
 // TAO_IDL - Generated from
 // be/be_visitor_typecode/objref_typecode.cpp:76
@@ -43,7 +43,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_objref,
     "IDL:ImplementationRepository/ServerObject:1.0",
     "ServerObject");
-  
+
 namespace ImplementationRepository
 {
   ::CORBA::TypeCode_ptr const _tc_ServerObject =
diff --git a/TAO/tao/ImR_Client/ServerObjectA.h b/TAO/tao/ImR_Client/ServerObjectA.h
new file mode 100644
index 00000000000..7dda3b08207
--- /dev/null
+++ b/TAO/tao/ImR_Client/ServerObjectA.h
@@ -0,0 +1,61 @@
+// -*- 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/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:805
+
+#ifndef _TAO_IDL_ORIG_SERVEROBJECTA_H_
+#define _TAO_IDL_ORIG_SERVEROBJECTA_H_
+
+#include /**/ "ace/pre.h"
+
+#include "imr_client_export.h"
+#include "tao/ImR_Client/ServerObjectC.h"
+
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_decl.cpp:49
+
+extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_ServerObject;
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_ch.cpp:53
+
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerObject_ptr); // copying
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerObject_ptr *); // non-copying
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerObject_ptr &);
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
diff --git a/TAO/tao/ImR_Client/ServerObjectS.cpp b/TAO/tao/ImR_Client/ServerObjectS.cpp
index 0efb994538d..8bf53af58f2 100644
--- a/TAO/tao/ImR_Client/ServerObjectS.cpp
+++ b/TAO/tao/ImR_Client/ServerObjectS.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // .\be\be_codegen.cpp:599
 
 #ifndef _TAO_IDL_SERVEROBJECTS_CPP_
@@ -53,8 +53,8 @@
 #include "tao/Stub.h"
 #include "tao/IFR_Client_Adapter.h"
 #include "tao/Object_T.h"
-#include "tao/TypeCode.h"
-#include "tao/DynamicC.h"
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/AnyTypeCode/DynamicC.h"
 #include "tao/CDR.h"
 #include "tao/operation_details.h"
 #include "tao/PortableInterceptor.h"
@@ -209,7 +209,7 @@ POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::the_TA
 {
   static POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker
   strategized_proxy_broker;
-  
+
   return &strategized_proxy_broker;
 }
 
@@ -231,7 +231,7 @@ POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::get_st
   TAO::Collocation_Strategy strategy =
     TAO_ORB_Core::collocation_strategy (obj ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (TAO::TAO_CS_REMOTE_STRATEGY);
-  
+
   return strategy;
 }
 
@@ -250,13 +250,13 @@ POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::dispat
 {
   TAO::Direct_Collocation_Upcall_Wrapper collocation_upcall_wrapper;
   collocation_upcall_wrapper.upcall (
-    obj, 
-    forward_obj, 
-    args, 
-    num_args, 
-    op, 
-    op_len, 
-    strategy 
+    obj,
+    forward_obj,
+    args,
+    num_args,
+    op,
+    op_len,
+    strategy
     ACE_ENV_ARG_PARAMETER);
 }
 
@@ -277,9 +277,9 @@ ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function (CORBA:
 int
 ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_Initializer (size_t)
 {
-  ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer = 
+  ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer =
     ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -298,14 +298,14 @@ ImplementationRepository__TAO_ServerObject_Proxy_Broker_Stub_Factory_Initializer
 POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::_TAO_ServerObject_Direct_Proxy_Impl (void)
 {}
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::ping (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument **,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -319,14 +319,14 @@ POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::ping (
       );
   ACE_CHECK;
 }
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::shutdown (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument **,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -346,7 +346,7 @@ POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::shutdown (
 //           End Direct Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:103
 
 POA_ImplementationRepository::ServerObject::ServerObject (void)
@@ -366,11 +366,11 @@ POA_ImplementationRepository::ServerObject::~ServerObject (void)
 }
 namespace POA_ImplementationRepository
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class ping_ServerObject
     : public TAO::Upcall_Command
   {
@@ -380,22 +380,22 @@ namespace POA_ImplementationRepository
       : servant_ (servant)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       this->servant_->ping (
         ACE_ENV_SINGLE_ARG_PARAMETER);
-      
+
     }
-  
+
   private:
     POA_ImplementationRepository::ServerObject * const servant_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_ImplementationRepository::ServerObject::ping_skel (
@@ -405,28 +405,28 @@ void POA_ImplementationRepository::ServerObject::ping_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_ImplementationRepository::ServerObject * const impl =
     static_cast<POA_ImplementationRepository::ServerObject *> (servant);
 
   ping_ServerObject command (
     impl);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -439,15 +439,15 @@ void POA_ImplementationRepository::ServerObject::ping_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_ImplementationRepository
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class shutdown_ServerObject
     : public TAO::Upcall_Command
   {
@@ -457,22 +457,22 @@ namespace POA_ImplementationRepository
       : servant_ (servant)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       this->servant_->shutdown (
         ACE_ENV_SINGLE_ARG_PARAMETER);
-      
+
     }
-  
+
   private:
     POA_ImplementationRepository::ServerObject * const servant_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_ImplementationRepository::ServerObject::shutdown_skel (
@@ -482,28 +482,28 @@ void POA_ImplementationRepository::ServerObject::shutdown_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_ImplementationRepository::ServerObject * const impl =
     static_cast<POA_ImplementationRepository::ServerObject *> (servant);
 
   shutdown_ServerObject command (
     impl);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -516,19 +516,19 @@ void POA_ImplementationRepository::ServerObject::shutdown_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_ImplementationRepository
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_ServerObject_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -542,68 +542,68 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
-      
+
+
       retval =
         this->servant_-> _is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
-        
+
     }
-  
+
   private:
     POA_ImplementationRepository::ServerObject * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_ImplementationRepository::ServerObject::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_ImplementationRepository::ServerObject * const impl =
     static_cast<POA_ImplementationRepository::ServerObject *> (servant);
-  
+
   _is_a_ServerObject_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -616,16 +616,16 @@ void POA_ImplementationRepository::ServerObject::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_ImplementationRepository
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_ServerObject_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -639,59 +639,59 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
-      
+
+
       retval =
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
-        
+
     }
-  
+
   private:
     POA_ImplementationRepository::ServerObject * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_ImplementationRepository::ServerObject::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_ImplementationRepository::ServerObject * const impl =
     static_cast<POA_ImplementationRepository::ServerObject *> (servant);
-  
+
   _non_existent_ServerObject_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -704,18 +704,18 @@ void POA_ImplementationRepository::ServerObject::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:393
 
 
 
 void POA_ImplementationRepository::ServerObject::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -725,30 +725,30 @@ void POA_ImplementationRepository::ServerObject::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW (CORBA::INTF_REPOS (CORBA::OMGVMCID | 1,
                                     CORBA::COMPLETED_NO));
     }
-  
+
   POA_ImplementationRepository::ServerObject * const impl =
     static_cast<POA_ImplementationRepository::ServerObject *> (servant);
-  CORBA::InterfaceDef_ptr _tao_retval = 
+  CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -757,11 +757,11 @@ void POA_ImplementationRepository::ServerObject::_interface_skel (
 
 namespace POA_ImplementationRepository
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_ServerObject_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -775,59 +775,59 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
-      
+
+
       retval =
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
-        
+
     }
-  
+
   private:
     POA_ImplementationRepository::ServerObject * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_ImplementationRepository::ServerObject::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_ImplementationRepository::ServerObject * const impl =
     static_cast<POA_ImplementationRepository::ServerObject *> (servant);
-  
+
   _get_component_ServerObject_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -840,7 +840,7 @@ void POA_ImplementationRepository::ServerObject::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 CORBA::Boolean POA_ImplementationRepository::ServerObject::_is_a (
@@ -889,22 +889,22 @@ POA_ImplementationRepository::ServerObject::_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 ();
-  
+
   CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::ImplementationRepository::ServerObject STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
diff --git a/TAO/tao/Invocation_Adapter.h b/TAO/tao/Invocation_Adapter.h
index d9f3ad21c1e..c464e06b644 100644
--- a/TAO/tao/Invocation_Adapter.h
+++ b/TAO/tao/Invocation_Adapter.h
@@ -29,8 +29,6 @@
 #include "tao/CORBA_methods.h"
 #include "tao/Pseudo_VarOut_T.h"
 
-
-struct TAO_Exception_Data;
 class TAO_Operation_Details;
 class TAO_Stub;
 class ACE_Time_Value;
@@ -267,7 +265,7 @@ namespace TAO
 
     /// String length of the operation name.
     int const op_len_;
-    
+
     /// Collocation proxy broker for this operation.
     Collocation_Proxy_Broker * const cpb_;
 
diff --git a/TAO/tao/Invocation_Base.cpp b/TAO/tao/Invocation_Base.cpp
index bcfa3ff6cef..7c0728b3c49 100644
--- a/TAO/tao/Invocation_Base.cpp
+++ b/TAO/tao/Invocation_Base.cpp
@@ -2,8 +2,6 @@
 #include "Stub.h"
 #include "operation_details.h"
 #include "ORB_Core.h"
-#include "TypeCode.h"
-#include "DynamicC.h"
 #include "SystemException.h"
 #include "PortableInterceptor.h"  /* Must always be visible. */
 
@@ -11,7 +9,6 @@
 
 #if TAO_HAS_INTERCEPTORS == 1
 # include "PortableInterceptorC.h"
-# include "RequestInfo_Util.h"
 # include "ClientRequestInterceptor_Adapter_Factory.h"
 #endif /* TAO_HAS_INTERCEPTORS == 1*/
 
@@ -75,73 +72,6 @@ namespace TAO
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-  char *
-  Invocation_Base::operation_name (void)
-  {
-    return const_cast<char *> (this->details_.opname ());
-  }
-
-  Dynamic::ParameterList *
-  Invocation_Base::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;
-
-    if (this->details_.parameter_list (*parameter_list) == false)
-      ACE_THROW_RETURN (CORBA::MARSHAL (),
-                        0);
-
-    return safe_parameter_list._retn ();
-  }
-
-  Dynamic::ExceptionList *
-  Invocation_Base::exceptions (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    // Generate the argument list on demand.
-    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;
-
-    if (this->details_.exception_list (*exception_list) == false)
-      ACE_THROW_RETURN (CORBA::MARSHAL (),
-                        0);
-
-    return safe_exception_list._retn ();
-  }
-
-  CORBA::Any *
-  Invocation_Base::result (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    // Generate the result on demand.
-    static const 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;
-
-    if (this->details_.result (result_any) == false)
-      ACE_THROW_RETURN (CORBA::MARSHAL (),
-                        0);
-
-    return safe_result_any._retn ();
-  }
-
-  CORBA::Octet
-  Invocation_Base::sync_scope (void) const
-  {
-    return this->details_.response_flags ();
-  }
-
   Invocation_Status
   Invocation_Base::send_request_interception (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
diff --git a/TAO/tao/Invocation_Base.h b/TAO/tao/Invocation_Base.h
index 65288736ecd..04488139d42 100644
--- a/TAO/tao/Invocation_Base.h
+++ b/TAO/tao/Invocation_Base.h
@@ -64,8 +64,8 @@ namespace TAO
   public:
     virtual ~Invocation_Base (void);
 
-    //@{
     /// Accessor and mutator methods
+    //@{
     TAO_ORB_Core *orb_core (void) const;
 
     TAO_Stub *stub (void) const;
@@ -109,6 +109,9 @@ namespace TAO
 
     /// Does this invocation return a response?
     CORBA::Boolean response_expected (void) const;
+
+    /// The operaton details of the invocation
+    TAO_Operation_Details &operation_details (void);
     //@}
 
   protected:
@@ -171,28 +174,6 @@ namespace TAO
     //@{
 #if TAO_HAS_INTERCEPTORS == 1
   public:
-    /// Return the name of the operation.
-    char *operation_name (void);
-
-    /// Return the list of arguments as a ParameterList
-    /**
-     * It is declared virtual so that the DynamicInterface can use its
-     * own way of creating the ParameterList.
-     */
-    virtual Dynamic::ParameterList *arguments (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// Return the list of exceptions declared as a ExceptionList
-    Dynamic::ExceptionList *exceptions (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// Return the result of the operation as an Any.
-    CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// Return the syncscope policy of the operation.
-    CORBA::Octet sync_scope (void) const;
-
     /// Return a reference to the number of interceptors pushed on to
     /// the current interceptor flow stack.
     /**
diff --git a/TAO/tao/Invocation_Base.inl b/TAO/tao/Invocation_Base.inl
index cf534126a6a..fcdf1d95f41 100644
--- a/TAO/tao/Invocation_Base.inl
+++ b/TAO/tao/Invocation_Base.inl
@@ -56,6 +56,12 @@ namespace TAO
     return this->target_;
   }
 
+  ACE_INLINE TAO_Operation_Details &
+  Invocation_Base::operation_details (void)
+  {
+    return this->details_;
+  }
+
 #if TAO_HAS_INTERCEPTORS == 1
   ACE_INLINE size_t &
   Invocation_Base::stack_size  (void)
diff --git a/TAO/tao/Leader_Follower_Flushing_Strategy.h b/TAO/tao/Leader_Follower_Flushing_Strategy.h
index ab2f4094968..630b0302a8a 100644
--- a/TAO/tao/Leader_Follower_Flushing_Strategy.h
+++ b/TAO/tao/Leader_Follower_Flushing_Strategy.h
@@ -27,7 +27,7 @@
  * @brief Implement a flushing strategy that uses the Leader/Follower
  *        set.
  */
-class TAO_Export TAO_Leader_Follower_Flushing_Strategy 
+class TAO_Leader_Follower_Flushing_Strategy
   : public TAO_Flushing_Strategy
 {
 public:
diff --git a/TAO/tao/LongDoubleSeqA.cpp b/TAO/tao/LongDoubleSeqA.cpp
deleted file mode 100644
index fe577fac602..00000000000
--- a/TAO/tao/LongDoubleSeqA.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-// -*- 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/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "LongDoubleSeqC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_CORBA_LongDoubleSeq_GUARD
-#define _TAO_TYPECODE_CORBA_LongDoubleSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_LongDoubleSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_longdouble,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_LongDoubleSeq_0 =
-      &CORBA_LongDoubleSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_LongDoubleSeq_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_LongDoubleSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/LongDoubleSeq:1.0",
-    "LongDoubleSeq",
-    &TAO::TypeCode::tc_CORBA_LongDoubleSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_LongDoubleSeq =
-    &_tao_tc_CORBA_LongDoubleSeq;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::LongDoubleSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::LongDoubleSeq>::insert_copy (
-      _tao_any,
-      CORBA::LongDoubleSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_LongDoubleSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::LongDoubleSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::LongDoubleSeq>::insert (
-      _tao_any,
-      CORBA::LongDoubleSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_LongDoubleSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::LongDoubleSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::LongDoubleSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::LongDoubleSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::LongDoubleSeq>::extract (
-        _tao_any,
-        CORBA::LongDoubleSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_LongDoubleSeq_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/LongDoubleSeqC.h b/TAO/tao/LongDoubleSeqC.h
index bdcba518788..87a2dcaab12 100644
--- a/TAO/tao/LongDoubleSeqC.h
+++ b/TAO/tao/LongDoubleSeqC.h
@@ -66,22 +66,22 @@
 
 namespace CORBA
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_LONGDOUBLESEQ_CH_)
 #define _CORBA_LONGDOUBLESEQ_CH_
-  
+
   class LongDoubleSeq;
-  
+
   typedef
     TAO_FixedSeq_Var_T<
         LongDoubleSeq,
         CORBA::LongDouble
       >
     LongDoubleSeq_var;
-  
+
   typedef
     TAO_Seq_Out_T<
         LongDoubleSeq,
@@ -89,7 +89,7 @@ namespace CORBA
         CORBA::LongDouble
       >
     LongDoubleSeq_out;
-  
+
   class TAO_Export LongDoubleSeq
     : public
         TAO_Unbounded_Sequence<
@@ -102,23 +102,18 @@ namespace CORBA
     LongDoubleSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        CORBA::LongDouble* buffer, 
+        CORBA::LongDouble* buffer,
         CORBA::Boolean release = 0
       );
     LongDoubleSeq (const LongDoubleSeq &);
     ~LongDoubleSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef LongDoubleSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_LongDoubleSeq;
 
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:66
@@ -134,14 +129,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::LongDoubleSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::LongDoubleSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::LongDoubleSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::LongDoubleSeq *&);
-
-// TAO_IDL - Generated from
 // be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_CORBA_LongDoubleSeq_H_
diff --git a/TAO/tao/LongLongSeqA.cpp b/TAO/tao/LongLongSeqA.cpp
deleted file mode 100644
index 26cd80eaacc..00000000000
--- a/TAO/tao/LongLongSeqA.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-// -*- 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/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "LongLongSeqC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_CORBA_LongLongSeq_GUARD
-#define _TAO_TYPECODE_CORBA_LongLongSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_LongLongSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_longlong,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_LongLongSeq_0 =
-      &CORBA_LongLongSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_LongLongSeq_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_LongLongSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/LongLongSeq:1.0",
-    "LongLongSeq",
-    &TAO::TypeCode::tc_CORBA_LongLongSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_LongLongSeq =
-    &_tao_tc_CORBA_LongLongSeq;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::LongLongSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::LongLongSeq>::insert_copy (
-      _tao_any,
-      CORBA::LongLongSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_LongLongSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::LongLongSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::LongLongSeq>::insert (
-      _tao_any,
-      CORBA::LongLongSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_LongLongSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::LongLongSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::LongLongSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::LongLongSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::LongLongSeq>::extract (
-        _tao_any,
-        CORBA::LongLongSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_LongLongSeq_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/LongLongSeqC.h b/TAO/tao/LongLongSeqC.h
index 2d5de085d1b..78c8d8223b9 100644
--- a/TAO/tao/LongLongSeqC.h
+++ b/TAO/tao/LongLongSeqC.h
@@ -66,22 +66,22 @@
 
 namespace CORBA
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_LONGLONGSEQ_CH_)
 #define _CORBA_LONGLONGSEQ_CH_
-  
+
   class LongLongSeq;
-  
+
   typedef
     TAO_FixedSeq_Var_T<
         LongLongSeq,
         CORBA::LongLong
       >
     LongLongSeq_var;
-  
+
   typedef
     TAO_Seq_Out_T<
         LongLongSeq,
@@ -89,7 +89,7 @@ namespace CORBA
         CORBA::LongLong
       >
     LongLongSeq_out;
-  
+
   class TAO_Export LongLongSeq
     : public
         TAO_Unbounded_Sequence<
@@ -102,23 +102,18 @@ namespace CORBA
     LongLongSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        CORBA::LongLong* buffer, 
+        CORBA::LongLong* buffer,
         CORBA::Boolean release = 0
       );
     LongLongSeq (const LongLongSeq &);
     ~LongLongSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef LongLongSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_LongLongSeq;
 
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:66
@@ -134,14 +129,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::LongLongSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::LongLongSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::LongLongSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::LongLongSeq *&);
-
-// TAO_IDL - Generated from
 // be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_CORBA_LongLongSeq_H_
diff --git a/TAO/tao/LongSeqA.cpp b/TAO/tao/LongSeqA.cpp
deleted file mode 100644
index 3664a6f3f21..00000000000
--- a/TAO/tao/LongSeqA.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-// -*- 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/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "LongSeqC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_CORBA_LongSeq_GUARD
-#define _TAO_TYPECODE_CORBA_LongSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_LongSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_long,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_LongSeq_0 =
-      &CORBA_LongSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_LongSeq_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_LongSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/LongSeq:1.0",
-    "LongSeq",
-    &TAO::TypeCode::tc_CORBA_LongSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_LongSeq =
-    &_tao_tc_CORBA_LongSeq;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::LongSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::LongSeq>::insert_copy (
-      _tao_any,
-      CORBA::LongSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_LongSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::LongSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::LongSeq>::insert (
-      _tao_any,
-      CORBA::LongSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_LongSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::LongSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::LongSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::LongSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::LongSeq>::extract (
-        _tao_any,
-        CORBA::LongSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_LongSeq_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/LongSeqC.h b/TAO/tao/LongSeqC.h
index 4e027ef765a..4fd2f60e996 100644
--- a/TAO/tao/LongSeqC.h
+++ b/TAO/tao/LongSeqC.h
@@ -66,22 +66,22 @@
 
 namespace CORBA
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_LONGSEQ_CH_)
 #define _CORBA_LONGSEQ_CH_
-  
+
   class LongSeq;
-  
+
   typedef
     TAO_FixedSeq_Var_T<
         LongSeq,
         CORBA::Long
       >
     LongSeq_var;
-  
+
   typedef
     TAO_Seq_Out_T<
         LongSeq,
@@ -89,7 +89,7 @@ namespace CORBA
         CORBA::Long
       >
     LongSeq_out;
-  
+
   class TAO_Export LongSeq
     : public
         TAO_Unbounded_Sequence<
@@ -102,23 +102,18 @@ namespace CORBA
     LongSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        CORBA::Long* buffer, 
+        CORBA::Long* buffer,
         CORBA::Boolean release = 0
       );
     LongSeq (const LongSeq &);
     ~LongSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef LongSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_LongSeq;
 
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:66
@@ -134,14 +129,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::LongSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::LongSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::LongSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::LongSeq *&);
-
-// TAO_IDL - Generated from
 // be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_CORBA_LongSeq_H_
diff --git a/TAO/tao/Marshal.cpp b/TAO/tao/Marshal.cpp
deleted file mode 100644
index b63181880a5..00000000000
--- a/TAO/tao/Marshal.cpp
+++ /dev/null
@@ -1,262 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    marshal.cpp
-//
-// = DESCRIPTION
-//   Implements the Marshal_Object class and the factory
-//
-//   The original encoder and decoder code now appears in files encode.cpp and
-//   decode.cpp
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems Inc.
-//     and
-//     Aniruddha Gokhale
-//
-// ============================================================================
-
-#include "tao/Marshal.h"
-#include "tao/TypeCode.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Marshal.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           Marshal, 
-           "$Id$")
-
-TAO_Marshal_Object::~TAO_Marshal_Object (void)
-{
-}
-
-TAO::traverse_status
-TAO_Marshal_Object::perform_skip (CORBA::TypeCode_ptr tc,
-                                  TAO_InputCDR *stream
-                                  ACE_ENV_ARG_DECL)
-{
-  CORBA::ULong kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  switch (kind)
-    {
-    default:
-    case CORBA::tk_fixed:
-    case CORBA::tk_value_box:
-    case CORBA::tk_native:
-    case CORBA::tk_abstract_interface:
-    case CORBA::tk_component:
-    case CORBA::tk_home:
-      // @@ We don't know how to handle any of them yet.
-      return TAO::TRAVERSE_STOP;
-
-    case CORBA::tk_null:
-    case CORBA::tk_void:
-    case CORBA::tk_short:
-    case CORBA::tk_long:
-    case CORBA::tk_ushort:
-    case CORBA::tk_ulong:
-    case CORBA::tk_float:
-    case CORBA::tk_double:
-    case CORBA::tk_boolean:
-    case CORBA::tk_char:
-    case CORBA::tk_octet:
-    case CORBA::tk_longlong:
-    case CORBA::tk_ulonglong:
-    case CORBA::tk_longdouble:
-    case CORBA::tk_wchar:
-    case CORBA::tk_enum:
-      {
-        TAO_Marshal_Primitive marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
-      }
-
-    case CORBA::tk_any:
-      {
-        TAO_Marshal_Any marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_TypeCode:
-      {
-        TAO_Marshal_TypeCode marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_Principal:
-      {
-        TAO_Marshal_Principal marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_objref:
-      {
-        TAO_Marshal_ObjRef marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_struct:
-      {
-        TAO_Marshal_Struct marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_union:
-      {
-        TAO_Marshal_Union marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_string:
-      {
-        TAO_Marshal_String marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_sequence:
-      {
-        TAO_Marshal_Sequence marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_array:
-      {
-        TAO_Marshal_Array marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_alias:
-      {
-        TAO_Marshal_Alias marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_except:
-      {
-        TAO_Marshal_Except marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_wstring:
-      {
-        TAO_Marshal_WString marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_value:
-      {
-        TAO_Marshal_Value marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
-      }
-    }
-}
-
-TAO::traverse_status
-TAO_Marshal_Object::perform_append (CORBA::TypeCode_ptr tc,
-                                    TAO_InputCDR *src,
-                                    TAO_OutputCDR *dest
-                                    ACE_ENV_ARG_DECL)
-{
-  CORBA::ULong kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  switch (kind)
-    {
-    default:
-    case CORBA::tk_fixed:
-    case CORBA::tk_value_box:
-    case CORBA::tk_native:
-    case CORBA::tk_abstract_interface:
-    case CORBA::tk_component:
-    case CORBA::tk_home:
-      // @@ We don't know how to handle any of them yet.
-      return TAO::TRAVERSE_STOP;
-
-    case CORBA::tk_null:
-    case CORBA::tk_void:
-    case CORBA::tk_short:
-    case CORBA::tk_long:
-    case CORBA::tk_ushort:
-    case CORBA::tk_ulong:
-    case CORBA::tk_float:
-    case CORBA::tk_double:
-    case CORBA::tk_boolean:
-    case CORBA::tk_char:
-    case CORBA::tk_octet:
-    case CORBA::tk_longlong:
-    case CORBA::tk_ulonglong:
-    case CORBA::tk_longdouble:
-    case CORBA::tk_wchar:
-    case CORBA::tk_enum:
-      {
-        TAO_Marshal_Primitive marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
-      }
-
-    case CORBA::tk_any:
-      {
-        TAO_Marshal_Any marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_TypeCode:
-      {
-        TAO_Marshal_TypeCode marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_Principal:
-      {
-        TAO_Marshal_Principal marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_objref:
-      {
-        TAO_Marshal_ObjRef marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_struct:
-      {
-        TAO_Marshal_Struct marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_union:
-      {
-        TAO_Marshal_Union marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_string:
-      {
-        TAO_Marshal_String marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_sequence:
-      {
-        TAO_Marshal_Sequence marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_array:
-      {
-        TAO_Marshal_Array marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_alias:
-      {
-        TAO_Marshal_Alias marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_except:
-      {
-        TAO_Marshal_Except marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_wstring:
-      {
-        TAO_Marshal_WString marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_value:
-      {
-        TAO_Marshal_Value marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
-      }
-    }
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Marshal.h b/TAO/tao/Marshal.h
deleted file mode 100644
index 2fee59a0e01..00000000000
--- a/TAO/tao/Marshal.h
+++ /dev/null
@@ -1,455 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Marshal.h
- *
- *  $Id$
- *
- *   Classes that marshal various IDL data types.
- *
- *
- *  @author  Aniruddha S. Gokhale
- */
-//=============================================================================
-
-
-#ifndef TAO_MARSHAL_H
-#define TAO_MARSHAL_H
-
-#include /**/ "ace/pre.h"
-#include "ace/CORBA_macros.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/Basic_Types.h"
-
-namespace CORBA
-{
-  class TypeCode;
-  typedef TypeCode *TypeCode_ptr;
-
-  class Environment;
-}
-
-class TAO_OutputCDR;
-class TAO_InputCDR;
-
-// = Forward declarations.
-class TAO_Marshal_Object;
-class TAO_Marshal_Primitive;
-class TAO_Marshal_Any;
-class TAO_Marshal_TypeCode;
-class TAO_Marshal_Principal;
-class TAO_Marshal_ObjRef;
-class TAO_Marshal_Struct;
-class TAO_Marshal_Union;
-class TAO_Marshal_String;
-class TAO_Marshal_Sequence;
-class TAO_Marshal_Array;
-class TAO_Marshal_Alias;
-class TAO_Marshal_Except;
-class TAO_Marshal_WString;
-class TAO_Marshal_Value;
-
-namespace TAO
-{
-  enum traverse_status
-    {
-      TRAVERSE_STOP,
-      TRAVERSE_CONTINUE
-    };
-}
-
-/**
- * @class TAO_Marshal_Object
- *
- * @brief TAO_Marshal_Object
- *
- * The Marshaling object that provides a common interface to the
- * CDR object for marshaling different IDL data types
- * Provides a set of virtual methods for appending and skipping
- * data over a CDR stream.
- */
-class TAO_Export TAO_Marshal_Object
-{
-public:
-  /// constructor
-  TAO_Marshal_Object (void);
-
-  /// destructor
-  virtual ~TAO_Marshal_Object (void);
-
-  /// skip entry point, it allocates the right kind of Marshal_Object
-  /// and invokes skip on it.
-  static TAO::traverse_status perform_skip (CORBA::TypeCode_ptr tc,
-                                            TAO_InputCDR *context
-                                            ACE_ENV_ARG_DECL);
-
-  /// skip operation
-  virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL) = 0;
-
-  /// append entry point, it allocates the right kind of Marshal_Object
-  /// and invokes skip on it.
-  static TAO::traverse_status perform_append (CORBA::TypeCode_ptr tc,
-                                              TAO_InputCDR *src,
-                                              TAO_OutputCDR *dest
-                                              ACE_ENV_ARG_DECL);
-
-  /// append operation
-  virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
-                                       TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL) = 0;
-};
-
-/**
- * @class TAO_Marshal_Primitive:
- *
- * @brief TAO_Marshal_Primitive
- *
- * marshaling primitives
- */
-class TAO_Export TAO_Marshal_Primitive: public TAO_Marshal_Object
-{
-public:
-  TAO_Marshal_Primitive (void);
-
-  /// skip operation
-  virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
-
-  /// append operation
-  virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
-                                       TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
-};
-
-/**
- * @class TAO_Marshal_Any:
- *
- * @brief TAO_Marshal_Any
- *
- * Marshal an Any
- */
-class TAO_Export TAO_Marshal_Any: public TAO_Marshal_Object
-{
-public:
-  TAO_Marshal_Any (void);
-
-  /// skip operation
-  virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
-
-  /// append operation
-  virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
-                                       TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
-};
-
-/**
- * @class TAO_Marshal_TypeCode:
- *
- * @brief TAO_Marshal_TypeCode
- *
- * marshal a typecode
- */
-class TAO_Export TAO_Marshal_TypeCode: public TAO_Marshal_Object
-{
-public:
-  TAO_Marshal_TypeCode (void);
-
-  /// skip operation
-  virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
-
-  /// append operation
-  virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
-                                       TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
-};
-
-/**
- * @class TAO_Marshal_Principal:
- *
- * @brief TAO_Marshal_Principal
- *
- * marshal a principal
- */
-class TAO_Export TAO_Marshal_Principal: public TAO_Marshal_Object
-{
-public:
-  TAO_Marshal_Principal (void);
-
-  /// skip operation
-  virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
-
-  /// append operation
-  virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
-                                       TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
-};
-
-/**
- * @class TAO_Marshal_ObjRef:
- *
- * @brief TAO_Marshal_ObjRef
- *
- * marshal an object reference
- */
-class TAO_Export TAO_Marshal_ObjRef: public TAO_Marshal_Object
-{
-public:
-  TAO_Marshal_ObjRef (void);
-
-  /// skip operation
-  virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
-
-  /// append operation
-  virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
-                                       TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
-};
-
-/**
- * @class TAO_Marshal_Struct:
- *
- * @brief TAO_Marshal_Struct
- *
- * marshal a struct
- */
-class TAO_Export TAO_Marshal_Struct: public TAO_Marshal_Object
-{
-public:
-  TAO_Marshal_Struct (void);
-
-  /// skip operation
-  virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
-
-  /// append operation
-  virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
-                                       TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
-};
-
-/**
- * @class TAO_Marshal_Union:
- *
- * @brief TAO_Marshal_Union
- *
- * marshal a union
- */
-class TAO_Export TAO_Marshal_Union: public TAO_Marshal_Object
-{
-public:
-  TAO_Marshal_Union (void);
-
-  /// skip operation
-  virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
-
-  /// append operation
-  virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
-                                       TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
-};
-
-/**
- * @class TAO_Marshal_String:
- *
- * @brief TAO_Marshal_String
- *
- * marshal a string
- */
-class TAO_Export TAO_Marshal_String: public TAO_Marshal_Object
-{
-public:
-  TAO_Marshal_String (void);
-
-  /// skip operation
-  virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
-
-  /// append operation
-  virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
-                                       TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
-};
-
-/**
- * @class TAO_Marshal_Sequence:
- *
- * @brief TAO_Marshal_Sequence
- *
- * marshal a sequence
- */
-class TAO_Export TAO_Marshal_Sequence: public TAO_Marshal_Object
-{
-public:
-  TAO_Marshal_Sequence (void);
-
-  /// skip operation
-  virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
-
-  /// append operation
-  virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
-                                       TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
-};
-
-/**
- * @class TAO_Marshal_Array:
- *
- * @brief TAO_Marshal_Array
- *
- * marshal an array
- */
-class TAO_Export TAO_Marshal_Array: public TAO_Marshal_Object
-{
-public:
-  TAO_Marshal_Array (void);
-
-  /// skip operation
-  virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
-
-  /// append operation
-  virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
-                                       TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
-};
-
-/**
- * @class TAO_Marshal_Alias:
- *
- * @brief TAO_Marshal_Alias
- *
- * marshal an alias
- */
-class TAO_Export TAO_Marshal_Alias: public TAO_Marshal_Object
-{
-public:
-  TAO_Marshal_Alias (void);
-
-  /// skip operation
-  virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
-
-  /// append operation
-  virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
-                                       TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
-};
-
-/**
- * @class TAO_Marshal_Except:
- *
- * @brief TAO_Marshal_Except
- *
- * marshal an exception
- */
-class TAO_Export TAO_Marshal_Except: public TAO_Marshal_Object
-{
-public:
-  TAO_Marshal_Except (void);
-
-  /// skip operation
-  virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
-
-  /// append operation
-  virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
-                                       TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
-};
-
-/**
- * @class TAO_Marshal_WString
- *
- * @brief TAO_Marshal_WString
- *
- * marshal a wide string
- */
-class TAO_Export TAO_Marshal_WString : public TAO_Marshal_Object
-{
-public:
-  TAO_Marshal_WString (void);
-
-  /// skip operation
-  virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
-
-  /// append operation
-  virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
-                                       TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
-};
-
-/**
- * @class TAO_Marshal_Value:
- *
- * @brief TAO_Marshal_Value
- *
- * marshal a valuetype
- */
-class TAO_Export TAO_Marshal_Value: public TAO_Marshal_Object
-{
-public:
-  TAO_Marshal_Value (void);
-
-  /// skip operation
-  virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
-
-  /// append operation
-  virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
-                                       TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
-
-private:
-  CORBA::Boolean nested_processing_;
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/Marshal.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_MARSHAL_H */
diff --git a/TAO/tao/Marshal.i b/TAO/tao/Marshal.i
deleted file mode 100644
index 8b78849a003..00000000000
--- a/TAO/tao/Marshal.i
+++ /dev/null
@@ -1,77 +0,0 @@
-//$Id$
-
-ACE_INLINE
-TAO_Marshal_Object::TAO_Marshal_Object (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Primitive::TAO_Marshal_Primitive (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Any::TAO_Marshal_Any (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Principal::TAO_Marshal_Principal (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_TypeCode::TAO_Marshal_TypeCode (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_ObjRef::TAO_Marshal_ObjRef (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Struct::TAO_Marshal_Struct (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Union::TAO_Marshal_Union (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_String::TAO_Marshal_String (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Sequence::TAO_Marshal_Sequence (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Array::TAO_Marshal_Array (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Alias::TAO_Marshal_Alias (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Except::TAO_Marshal_Except (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_WString::TAO_Marshal_WString (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Value::TAO_Marshal_Value (void)
-  : nested_processing_ (0)
-{
-}
diff --git a/TAO/tao/Messaging.mpc b/TAO/tao/Messaging.mpc
index 5a8e8333115..a5dafc89186 100644
--- a/TAO/tao/Messaging.mpc
+++ b/TAO/tao/Messaging.mpc
@@ -27,6 +27,9 @@ project : taolib, core, portableserver, pi, valuetype {
     Messaging
   }
 
+  IDL_Files {
+  }
+
   Pkgconfig_Files {
     Messaging/TAO_Messaging.pc.in
   }
diff --git a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp b/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp
index 56a75c6984d..df49288c887 100644
--- a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp
+++ b/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp
@@ -3,7 +3,7 @@
 #include "tao/ORB_Core.h"
 #include "tao/Stub.h"
 #include "tao/debug.h"
-
+#include "tao/AnyTypeCode/Any.h"
 
 ACE_RCSID (Messaging,
            Connection_Timeout_Policy_i,
diff --git a/TAO/tao/Messaging/Messaging.cpp b/TAO/tao/Messaging/Messaging.cpp
index f500acc331b..8b245a2ac34 100644
--- a/TAO/tao/Messaging/Messaging.cpp
+++ b/TAO/tao/Messaging/Messaging.cpp
@@ -54,10 +54,9 @@ exception_holder_raise (TAO::Exception_Data *exception_data,
           (_tao_in >> completion) == 0)
         ACE_THROW (CORBA::MARSHAL (TAO::VMCID,
                                    CORBA::COMPLETED_MAYBE));
+
       CORBA::SystemException* exception =
-        TAO_Exceptions::create_system_exception (type_id.in ()
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        TAO_Exceptions::create_system_exception (type_id.in ());
 
       if (exception == 0)
         {
diff --git a/TAO/tao/Messaging/MessagingA.cpp b/TAO/tao/Messaging/MessagingA.cpp
index 3ed9b68a974..4dba22229de 100644
--- a/TAO/tao/Messaging/MessagingA.cpp
+++ b/TAO/tao/Messaging/MessagingA.cpp
@@ -26,16 +26,17 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "Messaging.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/Value_TypeCode_Static.h"
-#include "tao/TypeCode_Value_Field.h"
-#include "tao/Recursive_Type_TypeCode.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Value_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Value_Field.h"
+#include "tao/AnyTypeCode/Recursive_Type_TypeCode.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "tao/AnyTypeCode/OctetSeqA.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/value_typecode.cpp:61
@@ -50,7 +51,7 @@ static TAO::TypeCode::Value_Field<char const *, CORBA::TypeCode_ptr const *> con
     { "is_system_exception", &CORBA::_tc_boolean, CORBA::PUBLIC_MEMBER },
     { "byte_order", &CORBA::_tc_boolean, CORBA::PUBLIC_MEMBER },
     { "marshaled_exception", &CORBA::_tc_OctetSeq, CORBA::PUBLIC_MEMBER }
-    
+
   };
 static TAO::TypeCode::Value<char const *,
                      CORBA::TypeCode_ptr const *,
@@ -64,7 +65,7 @@ static TAO::TypeCode::Value<char const *,
     &CORBA::_tc_null,
     _tao_fields_Messaging_ExceptionHolder,
     3);
-  
+
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_ExceptionHolder =
@@ -82,7 +83,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_objref,
     "IDL:omg.org/Messaging/ReplyHandler:1.0",
     "ReplyHandler");
-  
+
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_ReplyHandler =
diff --git a/TAO/tao/Messaging/MessagingC.cpp b/TAO/tao/Messaging/MessagingC.cpp
index b1d34471827..1fcfb9dc5f4 100644
--- a/TAO/tao/Messaging/MessagingC.cpp
+++ b/TAO/tao/Messaging/MessagingC.cpp
@@ -126,29 +126,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);
@@ -172,7 +172,7 @@ Messaging::ExceptionHolder_init::_downcast (CORBA::ValueFactoryBase *v)
   return dynamic_cast< ::Messaging::ExceptionHolder_init * > (v);
 }
 
-const char* 
+const char*
 Messaging::ExceptionHolder_init::tao_repository_id (void)
 {
   return ::Messaging::ExceptionHolder::_tao_obv_static_repository_id ();
@@ -227,7 +227,7 @@ TAO::Objref_Traits<Messaging::ReplyHandler>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -251,7 +251,7 @@ Messaging::ReplyHandler::Messaging_ReplyHandler_setup_collocation ()
 Messaging::ReplyHandler::~ReplyHandler (void)
 {}
 
-void 
+void
 Messaging::ReplyHandler::_tao_any_destructor (void *_tao_void_pointer)
 {
   ReplyHandler *_tao_tmp_pointer =
@@ -296,7 +296,7 @@ Messaging::ReplyHandler::_duplicate (ReplyHandler_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -480,8 +480,8 @@ CORBA::Boolean
 OBV_Messaging::ExceptionHolder::_tao_marshal_state (TAO_OutputCDR &strm) const
 {
   return (
-      (strm << CORBA::Any::from_boolean (_pd_is_system_exception)) &&
-      (strm << CORBA::Any::from_boolean (_pd_byte_order)) &&
+      (strm << ACE_OutputCDR::from_boolean (_pd_is_system_exception)) &&
+      (strm << ACE_OutputCDR::from_boolean (_pd_byte_order)) &&
       (strm << _pd_marshaled_exception)
     );
 }
@@ -490,8 +490,8 @@ CORBA::Boolean
 OBV_Messaging::ExceptionHolder::_tao_unmarshal_state (TAO_InputCDR &strm)
 {
   return (
-    (strm >> CORBA::Any::to_boolean (_pd_is_system_exception)) &&
-    (strm >> CORBA::Any::to_boolean (_pd_byte_order)) &&
+    (strm >> ACE_InputCDR::to_boolean (_pd_is_system_exception)) &&
+    (strm >> ACE_InputCDR::to_boolean (_pd_byte_order)) &&
     (strm >> _pd_marshaled_exception)
   );
 }
@@ -514,20 +514,20 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::Messaging::ReplyHandler RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
diff --git a/TAO/tao/Messaging/MessagingS.cpp b/TAO/tao/Messaging/MessagingS.cpp
index 26e5e5b1124..8ee0e3c16c5 100644
--- a/TAO/tao/Messaging/MessagingS.cpp
+++ b/TAO/tao/Messaging/MessagingS.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_codegen.cpp:599
 
 #ifndef _TAO_IDL_ORIG_MESSAGINGS_CPP_
@@ -52,8 +52,8 @@
 #include "tao/Stub.h"
 #include "tao/IFR_Client_Adapter.h"
 #include "tao/Object_T.h"
-#include "tao/TypeCode.h"
-#include "tao/DynamicC.h"
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/AnyTypeCode/DynamicC.h"
 #include "tao/CDR.h"
 #include "tao/operation_details.h"
 #include "tao/PortableInterceptor.h"
@@ -203,7 +203,7 @@ POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker::the_TAO_ReplyHandler_
 {
   static POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker
   strategized_proxy_broker;
-  
+
   return &strategized_proxy_broker;
 }
 
@@ -225,7 +225,7 @@ POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker::get_strategy (
   TAO::Collocation_Strategy strategy =
     TAO_ORB_Core::collocation_strategy (obj ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (TAO::TAO_CS_REMOTE_STRATEGY);
-  
+
   return strategy;
 }
 
@@ -244,13 +244,13 @@ POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker::dispatch (
 {
   TAO::Direct_Collocation_Upcall_Wrapper collocation_upcall_wrapper;
   collocation_upcall_wrapper.upcall (
-    obj, 
-    forward_obj, 
-    args, 
-    num_args, 
-    op, 
-    op_len, 
-    strategy 
+    obj,
+    forward_obj,
+    args,
+    num_args,
+    op,
+    op_len,
+    strategy
     ACE_ENV_ARG_PARAMETER);
 }
 
@@ -271,9 +271,9 @@ Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_function (CORBA::Object_ptr)
 int
 Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_Initializer (size_t)
 {
-  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;
 }
 
@@ -301,7 +301,7 @@ POA_Messaging::_TAO_ReplyHandler_Direct_Proxy_Impl::~_TAO_ReplyHandler_Direct_Pr
 //           End Direct Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_Messaging::ReplyHandler::ReplyHandler (void)
@@ -320,16 +320,16 @@ POA_Messaging::ReplyHandler::~ReplyHandler (void)
 {
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_Messaging
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_ReplyHandler_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -343,68 +343,68 @@ namespace POA_Messaging
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
-      
+
+
       retval =
         this->servant_-> _is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
-        
+
     }
-  
+
   private:
     POA_Messaging::ReplyHandler * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_Messaging::ReplyHandler::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_Messaging::ReplyHandler * const impl =
     static_cast<POA_Messaging::ReplyHandler *> (servant);
-  
+
   _is_a_ReplyHandler_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -417,16 +417,16 @@ void POA_Messaging::ReplyHandler::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_Messaging
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_ReplyHandler_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -440,59 +440,59 @@ namespace POA_Messaging
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
-      
+
+
       retval =
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
-        
+
     }
-  
+
   private:
     POA_Messaging::ReplyHandler * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_Messaging::ReplyHandler::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_Messaging::ReplyHandler * const impl =
     static_cast<POA_Messaging::ReplyHandler *> (servant);
-  
+
   _non_existent_ReplyHandler_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -505,18 +505,18 @@ void POA_Messaging::ReplyHandler::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:393
 
 
 
 void POA_Messaging::ReplyHandler::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -526,30 +526,30 @@ void POA_Messaging::ReplyHandler::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW (CORBA::INTF_REPOS (CORBA::OMGVMCID | 1,
                                     CORBA::COMPLETED_NO));
     }
-  
+
   POA_Messaging::ReplyHandler * const impl =
     static_cast<POA_Messaging::ReplyHandler *> (servant);
-  CORBA::InterfaceDef_ptr _tao_retval = 
+  CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -558,11 +558,11 @@ void POA_Messaging::ReplyHandler::_interface_skel (
 
 namespace POA_Messaging
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_ReplyHandler_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -576,59 +576,59 @@ namespace POA_Messaging
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
-      
+
+
       retval =
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
-        
+
     }
-  
+
   private:
     POA_Messaging::ReplyHandler * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_Messaging::ReplyHandler::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_Messaging::ReplyHandler * const impl =
     static_cast<POA_Messaging::ReplyHandler *> (servant);
-  
+
   _get_component_ReplyHandler_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -641,7 +641,7 @@ void POA_Messaging::ReplyHandler::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 CORBA::Boolean POA_Messaging::ReplyHandler::_is_a (
@@ -690,22 +690,22 @@ 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 ();
-  
+
   CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::Messaging::ReplyHandler STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
diff --git a/TAO/tao/Messaging/Messaging_No_ImplA.cpp b/TAO/tao/Messaging/Messaging_No_ImplA.cpp
index cb99e224ed5..4d9d4e4736f 100644
--- a/TAO/tao/Messaging/Messaging_No_ImplA.cpp
+++ b/TAO/tao/Messaging/Messaging_No_ImplA.cpp
@@ -26,17 +26,17 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "Messaging_No_ImplC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/Recursive_Type_TypeCode.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
+#include "tao/AnyTypeCode/Recursive_Type_TypeCode.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/alias_typecode.cpp:50
@@ -49,7 +49,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/Messaging/Priority:1.0",
     "Priority",
     &CORBA::_tc_short);
-  
+
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_Priority =
@@ -69,7 +69,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/Messaging/RebindMode:1.0",
     "RebindMode",
     &CORBA::_tc_short);
-  
+
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_RebindMode =
@@ -89,7 +89,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/Messaging/RoutingType:1.0",
     "RoutingType",
     &CORBA::_tc_short);
-  
+
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_RoutingType =
@@ -109,7 +109,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/Messaging/Ordering:1.0",
     "Ordering",
     &CORBA::_tc_ushort);
-  
+
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_Ordering =
@@ -127,7 +127,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/Messaging/RebindPolicy:1.0",
     "RebindPolicy");
-  
+
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_RebindPolicy =
@@ -143,7 +143,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
   {
     { "min", &Messaging::_tc_Priority },
     { "max", &Messaging::_tc_Priority }
-    
+
   };
 static TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
@@ -155,7 +155,7 @@ static TAO::TypeCode::Struct<char const *,
     "PriorityRange",
     _tao_fields_Messaging_PriorityRange,
     2);
-  
+
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_PriorityRange =
@@ -173,7 +173,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/Messaging/RequestPriorityPolicy:1.0",
     "RequestPriorityPolicy");
-  
+
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_RequestPriorityPolicy =
@@ -191,7 +191,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/Messaging/ReplyPriorityPolicy:1.0",
     "ReplyPriorityPolicy");
-  
+
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_ReplyPriorityPolicy =
@@ -209,7 +209,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/Messaging/RequestStartTimePolicy:1.0",
     "RequestStartTimePolicy");
-  
+
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_RequestStartTimePolicy =
@@ -227,7 +227,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/Messaging/RequestEndTimePolicy:1.0",
     "RequestEndTimePolicy");
-  
+
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_RequestEndTimePolicy =
@@ -245,7 +245,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/Messaging/ReplyStartTimePolicy:1.0",
     "ReplyStartTimePolicy");
-  
+
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_ReplyStartTimePolicy =
@@ -263,7 +263,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/Messaging/ReplyEndTimePolicy:1.0",
     "ReplyEndTimePolicy");
-  
+
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_ReplyEndTimePolicy =
@@ -281,7 +281,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/Messaging/RelativeRequestTimeoutPolicy:1.0",
     "RelativeRequestTimeoutPolicy");
-  
+
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_RelativeRequestTimeoutPolicy =
@@ -297,7 +297,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
   {
     { "min", &Messaging::_tc_RoutingType },
     { "max", &Messaging::_tc_RoutingType }
-    
+
   };
 static TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
@@ -309,7 +309,7 @@ static TAO::TypeCode::Struct<char const *,
     "RoutingTypeRange",
     _tao_fields_Messaging_RoutingTypeRange,
     2);
-  
+
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_RoutingTypeRange =
@@ -327,7 +327,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/Messaging/RoutingPolicy:1.0",
     "RoutingPolicy");
-  
+
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_RoutingPolicy =
@@ -345,7 +345,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/Messaging/MaxHopsPolicy:1.0",
     "MaxHopsPolicy");
-  
+
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_MaxHopsPolicy =
@@ -363,7 +363,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/Messaging/QueueOrderPolicy:1.0",
     "QueueOrderPolicy");
-  
+
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_QueueOrderPolicy =
@@ -396,7 +396,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<Messaging::RebindPolicy>::demarshal_value (TAO_InputCDR &)
@@ -447,7 +447,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -529,7 +529,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<Messaging::RequestPriorityPolicy>::demarshal_value (TAO_InputCDR &)
@@ -604,7 +604,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<Messaging::ReplyPriorityPolicy>::demarshal_value (TAO_InputCDR &)
@@ -679,7 +679,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<Messaging::RequestStartTimePolicy>::demarshal_value (TAO_InputCDR &)
@@ -754,7 +754,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<Messaging::RequestEndTimePolicy>::demarshal_value (TAO_InputCDR &)
@@ -829,7 +829,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<Messaging::ReplyStartTimePolicy>::demarshal_value (TAO_InputCDR &)
@@ -904,7 +904,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<Messaging::ReplyEndTimePolicy>::demarshal_value (TAO_InputCDR &)
@@ -979,7 +979,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<Messaging::RelativeRequestTimeoutPolicy>::demarshal_value (TAO_InputCDR &)
@@ -1030,7 +1030,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -1112,7 +1112,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<Messaging::RoutingPolicy>::demarshal_value (TAO_InputCDR &)
@@ -1187,7 +1187,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<Messaging::MaxHopsPolicy>::demarshal_value (TAO_InputCDR &)
@@ -1262,7 +1262,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<Messaging::QueueOrderPolicy>::demarshal_value (TAO_InputCDR &)
diff --git a/TAO/tao/Messaging/Messaging_PolicyFactory.cpp b/TAO/tao/Messaging/Messaging_PolicyFactory.cpp
index 2897a284bd5..d93b65c098c 100644
--- a/TAO/tao/Messaging/Messaging_PolicyFactory.cpp
+++ b/TAO/tao/Messaging/Messaging_PolicyFactory.cpp
@@ -9,7 +9,27 @@ ACE_RCSID (Messaging,
 
 #include "tao/PolicyC.h"
 #include "tao/Buffering_Constraint_Policy.h"
-#include "tao/Any.h"
+#include "tao/AnyTypeCode/TAOA.h"
+#include "tao/AnyTypeCode/Any.h"
+
+CORBA::Policy_ptr
+TAO_Messaging_PolicyFactory::create_buffering_constraint_policy (
+    const CORBA::Any& val
+    ACE_ENV_ARG_DECL)
+{
+  TAO::BufferingConstraint *buffering_constraint = 0;
+  if ((val >>= buffering_constraint) == 0)
+    ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE),
+                      CORBA::Policy::_nil ());
+
+  TAO_Buffering_Constraint_Policy *servant = 0;
+  ACE_NEW_THROW_EX (servant,
+                    TAO_Buffering_Constraint_Policy (*buffering_constraint),
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+
+  return servant;
+}
 
 CORBA::Policy_ptr
 TAO_Messaging_PolicyFactory::create_policy (
@@ -39,8 +59,8 @@ TAO_Messaging_PolicyFactory::create_policy (
 
 #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
   if (type == TAO::BUFFERING_CONSTRAINT_POLICY_TYPE)
-    return TAO_Buffering_Constraint_Policy::create (value
-                                                    ACE_ENV_ARG_PARAMETER);
+    return this->create_buffering_constraint_policy (value
+                                                     ACE_ENV_ARG_PARAMETER);
 #endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
 
   if (
diff --git a/TAO/tao/Messaging/Messaging_PolicyFactory.h b/TAO/tao/Messaging/Messaging_PolicyFactory.h
index 286acf3d7dc..2a76ceb3993 100644
--- a/TAO/tao/Messaging/Messaging_PolicyFactory.h
+++ b/TAO/tao/Messaging/Messaging_PolicyFactory.h
@@ -45,6 +45,10 @@ public:
                                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CORBA::PolicyError));
+private:
+  CORBA::Policy_ptr
+  create_buffering_constraint_policy (const CORBA::Any& val
+                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 };
 
 
diff --git a/TAO/tao/Messaging/Messaging_Policy_i.cpp b/TAO/tao/Messaging/Messaging_Policy_i.cpp
index ede4f4ec4bd..f4e244a8696 100644
--- a/TAO/tao/Messaging/Messaging_Policy_i.cpp
+++ b/TAO/tao/Messaging/Messaging_Policy_i.cpp
@@ -3,6 +3,7 @@
 #include "tao/Stub.h"
 #include "tao/ORB_Core.h"
 #include "tao/debug.h"
+#include "tao/AnyTypeCode/Any.h"
 
 #if ! defined (__ACE_INLINE__)
 #include "Messaging_Policy_i.i"
diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyA.cpp b/TAO/tao/Messaging/Messaging_RT_PolicyA.cpp
index 22f0f631301..3d7726af4df 100644
--- a/TAO/tao/Messaging/Messaging_RT_PolicyA.cpp
+++ b/TAO/tao/Messaging/Messaging_RT_PolicyA.cpp
@@ -26,13 +26,14 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "Messaging_RT_PolicyC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "tao/AnyTypeCode/TimeBaseA.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/alias_typecode.cpp:50
@@ -45,7 +46,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/Messaging/Timeout:1.0",
     "Timeout",
     &TimeBase::_tc_TimeT);
-  
+
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_Timeout =
@@ -63,7 +64,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/Messaging/RelativeRoundtripTimeoutPolicy:1.0",
     "RelativeRoundtripTimeoutPolicy");
-  
+
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_RelativeRoundtripTimeoutPolicy =
@@ -96,7 +97,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<Messaging::RelativeRoundtripTimeoutPolicy>::demarshal_value (TAO_InputCDR &)
diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.cpp b/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.cpp
index a14bdb23202..2e1c5244428 100644
--- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.cpp
+++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.cpp
@@ -26,13 +26,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "Messaging_SyncScope_PolicyC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/objref_typecode.cpp:76
@@ -43,7 +43,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/Messaging/SyncScopePolicy:1.0",
     "SyncScopePolicy");
-  
+
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_SyncScopePolicy =
@@ -76,7 +76,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<Messaging::SyncScopePolicy>::demarshal_value (TAO_InputCDR &)
diff --git a/TAO/tao/Messaging/PollableC.cpp b/TAO/tao/Messaging/PollableC.cpp
index 6811a0edd6d..a99b058b3dd 100644
--- a/TAO/tao/Messaging/PollableC.cpp
+++ b/TAO/tao/Messaging/PollableC.cpp
@@ -31,14 +31,14 @@
 
 #include "PollableC.h"
 #include "tao/CDR.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 #include "ace/OS_NS_string.h"
 
 #if defined (__BORLANDC__)
@@ -96,7 +96,7 @@ CORBA::Pollable::Pollable (void)
 CORBA::Pollable::~Pollable (void)
 {}
 
-void 
+void
 CORBA::Pollable::_tao_any_destructor (void *_tao_void_pointer)
 {
   Pollable *_tao_tmp_pointer =
@@ -133,7 +133,7 @@ CORBA::Pollable::_duplicate (Pollable_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -192,7 +192,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/CORBA/Pollable:1.0",
     "Pollable");
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_Pollable =
@@ -243,7 +243,7 @@ CORBA::DIIPollable::DIIPollable (void)
 CORBA::DIIPollable::~DIIPollable (void)
 {}
 
-void 
+void
 CORBA::DIIPollable::_tao_any_destructor (void *_tao_void_pointer)
 {
   DIIPollable *_tao_tmp_pointer =
@@ -280,7 +280,7 @@ CORBA::DIIPollable::_duplicate (DIIPollable_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -343,7 +343,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/CORBA/DIIPollable:1.0",
     "DIIPollable");
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_DIIPollable =
@@ -388,7 +388,7 @@ TAO::Objref_Traits<CORBA::PollableSet>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 CORBA::PollableSet::NoPossiblePollable::NoPossiblePollable (void)
@@ -497,11 +497,11 @@ static TAO::TypeCode::Struct<char const *,
     "NoPossiblePollable",
     _tao_fields_CORBA_PollableSet_NoPossiblePollable,
     0);
-  
+
 ::CORBA::TypeCode_ptr const CORBA::PollableSet::_tc_NoPossiblePollable =
   &_tao_tc_CORBA_PollableSet_NoPossiblePollable;
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 CORBA::PollableSet::UnknownPollable::UnknownPollable (void)
@@ -610,7 +610,7 @@ static TAO::TypeCode::Struct<char const *,
     "UnknownPollable",
     _tao_fields_CORBA_PollableSet_UnknownPollable,
     0);
-  
+
 ::CORBA::TypeCode_ptr const CORBA::PollableSet::_tc_UnknownPollable =
   &_tao_tc_CORBA_PollableSet_UnknownPollable;
 
@@ -620,7 +620,7 @@ CORBA::PollableSet::PollableSet (void)
 CORBA::PollableSet::~PollableSet (void)
 {}
 
-void 
+void
 CORBA::PollableSet::_tao_any_destructor (void *_tao_void_pointer)
 {
   PollableSet *_tao_tmp_pointer =
@@ -657,7 +657,7 @@ CORBA::PollableSet::_duplicate (PollableSet_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -716,7 +716,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/CORBA/PollableSet:1.0",
     "PollableSet");
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_PollableSet =
@@ -749,7 +749,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<CORBA::Pollable>::demarshal_value (TAO_InputCDR &)
@@ -824,7 +824,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<CORBA::DIIPollable>::demarshal_value (TAO_InputCDR &)
@@ -899,7 +899,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<CORBA::PollableSet>::demarshal_value (TAO_InputCDR &)
@@ -950,7 +950,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 namespace TAO
@@ -961,7 +961,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Dual_Impl_T<CORBA::PollableSet::NoPossiblePollable>::demarshal_value (TAO_InputCDR &)
@@ -1025,7 +1025,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 namespace TAO
@@ -1036,7 +1036,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Dual_Impl_T<CORBA::PollableSet::UnknownPollable>::demarshal_value (TAO_InputCDR &)
diff --git a/TAO/tao/Messaging/TAO_ExtA.cpp b/TAO/tao/Messaging/TAO_ExtA.cpp
index 6b1f475f8f8..3bce6d7972b 100644
--- a/TAO/tao/Messaging/TAO_ExtA.cpp
+++ b/TAO/tao/Messaging/TAO_ExtA.cpp
@@ -26,13 +26,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "TAO_ExtC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/objref_typecode.cpp:76
@@ -43,7 +43,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:tao/TAO/ConnectionTimeoutPolicy:1.0",
     "ConnectionTimeoutPolicy");
-  
+
 namespace TAO
 {
   ::CORBA::TypeCode_ptr const _tc_ConnectionTimeoutPolicy =
@@ -76,7 +76,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<TAO::ConnectionTimeoutPolicy>::demarshal_value (TAO_InputCDR &)
diff --git a/TAO/tao/Messaging_PolicyValue.pidl b/TAO/tao/Messaging_PolicyValue.pidl
index fcff2799c8b..7467a10720a 100644
--- a/TAO/tao/Messaging_PolicyValue.pidl
+++ b/TAO/tao/Messaging_PolicyValue.pidl
@@ -8,12 +8,15 @@
  *
  * The command used to generate code from this file is:
  *
- *   tao_idl.exe
- *        -o orig -Ge 1 -GA -Sc -Sci
- *        -Wb,export_macro=TAO_Export
- *        -Wb,export_include=tao/TAO_Export.h
- *        -Wb,pre_include="ace/pre.h"
- *        -Wb,post_include="ace/post.h"
+ *     tao_idl
+ *          -oA AnyTypeCode
+ *          -Ge 1 -GA -Sc -SS -Sci
+ *          -Wb,pre_include=ace/pre.h
+ *          -Wb,post_include=ace/post.h
+ *          -Wb,export_macro=TAO_Export
+ *          -Wb,export_include=tao/TAO_Export.h
+ *          -Wb,anyop_export_macro=TAO_AnyTypeCode_Export
+ *          -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h
  *        Messaging_PolicyValue.pidl
  *
  */
diff --git a/TAO/tao/Messaging_PolicyValueA.cpp b/TAO/tao/Messaging_PolicyValueA.cpp
deleted file mode 100644
index 6b5404ab811..00000000000
--- a/TAO/tao/Messaging_PolicyValueA.cpp
+++ /dev/null
@@ -1,237 +0,0 @@
-// -*- 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/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "Messaging_PolicyValueC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/Recursive_Type_TypeCode.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_Messaging_PolicyValue[] =
-  {
-    { "ptype", &CORBA::_tc_PolicyType },
-    { "pvalue", &CORBA::_tc_OctetSeq }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_Messaging_PolicyValue (
-    CORBA::tk_struct,
-    "IDL:omg.org/Messaging/PolicyValue:1.0",
-    "PolicyValue",
-    _tao_fields_Messaging_PolicyValue,
-    2);
-  
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr const _tc_PolicyValue =
-    &_tao_tc_Messaging_PolicyValue;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_Messaging_PolicyValueSeq_GUARD
-#define _TAO_TYPECODE_Messaging_PolicyValueSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      Messaging_PolicyValueSeq_0 (
-        CORBA::tk_sequence,
-        &Messaging::_tc_PolicyValue,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_Messaging_PolicyValueSeq_0 =
-      &Messaging_PolicyValueSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_Messaging_PolicyValueSeq_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_Messaging_PolicyValueSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/Messaging/PolicyValueSeq:1.0",
-    "PolicyValueSeq",
-    &TAO::TypeCode::tc_Messaging_PolicyValueSeq_0);
-  
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr const _tc_PolicyValueSeq =
-    &_tao_tc_Messaging_PolicyValueSeq;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const Messaging::PolicyValue &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<Messaging::PolicyValue>::insert_copy (
-      _tao_any,
-      Messaging::PolicyValue::_tao_any_destructor,
-      Messaging::_tc_PolicyValue,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::PolicyValue *_tao_elem
-  )
-{
-  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).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::PolicyValue *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const Messaging::PolicyValue *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const Messaging::PolicyValue *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<Messaging::PolicyValue>::extract (
-        _tao_any,
-        Messaging::PolicyValue::_tao_any_destructor,
-        Messaging::_tc_PolicyValue,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const Messaging::PolicyValueSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<Messaging::PolicyValueSeq>::insert_copy (
-      _tao_any,
-      Messaging::PolicyValueSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_Messaging_PolicyValueSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::PolicyValueSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<Messaging::PolicyValueSeq>::insert (
-      _tao_any,
-      Messaging::PolicyValueSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_Messaging_PolicyValueSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::PolicyValueSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const Messaging::PolicyValueSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const Messaging::PolicyValueSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<Messaging::PolicyValueSeq>::extract (
-        _tao_any,
-        Messaging::PolicyValueSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_Messaging_PolicyValueSeq_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/Messaging_PolicyValueC.h b/TAO/tao/Messaging_PolicyValueC.h
index ab003706b1e..abe0c4f2eb5 100644
--- a/TAO/tao/Messaging_PolicyValueC.h
+++ b/TAO/tao/Messaging_PolicyValueC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_MESSAGING_POLICYVALUEC_H_
-#define _TAO_IDL_ORIG_MESSAGING_POLICYVALUEC_H_
+#ifndef _TAO_IDL_MESSAGING_POLICYVALUEC_H_
+#define _TAO_IDL_MESSAGING_POLICYVALUEC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -61,10 +61,6 @@
 #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
 // be\be_visitor_module/module_ch.cpp:48
 
@@ -90,7 +86,7 @@ namespace Messaging
     PolicyValue_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
+  // be\be_visitor_structure/structure_ch.cpp:57
   
   struct TAO_Export PolicyValue
   {
@@ -102,11 +98,6 @@ namespace Messaging
   };
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_PolicyValue;
-  
-  // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_MESSAGING_POLICYVALUESEQ_CH_)
@@ -155,11 +146,6 @@ namespace Messaging
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_PolicyValueSeq;
-  
-  // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
   
   const IOP::ComponentId TAG_POLICIES = 2U;
@@ -183,22 +169,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// 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
-// 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
 // be\be_visitor_structure/cdr_op_ch.cpp:54
 
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::PolicyValue &);
@@ -222,16 +192,12 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_Messaging_PolicyValueSeq_H_ */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
+// be\be_codegen.cpp:1062
 
 #if defined(_MSC_VER)
 #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/NVList.cpp b/TAO/tao/NVList.cpp
deleted file mode 100644
index d6e2b993635..00000000000
--- a/TAO/tao/NVList.cpp
+++ /dev/null
@@ -1,498 +0,0 @@
-// $Id$
-
-
-// Implementation of Named Value List and NamedValue classes
-
-#include "NVList.h"
-
-#include "tao/SystemException.h"
-#include "tao/BoundsC.h"
-#include "tao/TypeCode.h"
-#include "tao/Marshal.h"
-#include "tao/CORBA_String.h"
-#include "tao/Any_Impl.h"
-#include "tao/CDR.h"
-#include "tao/debug.h"
-
-#include "ace/Auto_Ptr.h"
-#include "ace/Log_Msg.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/NVList.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           NVList,
-           "$Id$")
-
-// Reference counting for DII Request object
-
-CORBA::ULong
-CORBA::NamedValue::_incr_refcnt (void)
-{
-  return ++this->refcount_;
-}
-
-CORBA::ULong
-CORBA::NamedValue::_decr_refcnt (void)
-{
-  const CORBA::ULong new_count = --this->refcount_;
-
-  if (new_count == 0)
-    delete this;
-
-  return new_count;
-}
-
-CORBA::NamedValue::~NamedValue (void)
-{
-  if (this->name_)
-    {
-      CORBA::string_free (this->name_);
-      this->name_ = 0;
-    }
-  // the any will be destroyed by itself
-}
-
-// ****************************************************************
-
-CORBA::ULong
-CORBA::NVList::_incr_refcnt (void)
-{
-  return ++this->refcount_;
-}
-
-CORBA::ULong
-CORBA::NVList::_decr_refcnt (void)
-{
-  const CORBA::ULong new_count = --this->refcount_;
-
-  if (new_count == 0)
-    delete this;
-
-  return new_count;
-}
-
-CORBA::NVList::~NVList (void)
-{
-  // initialize an iterator and delete each NamedValue
-  ACE_Unbounded_Queue_Iterator<CORBA::NamedValue_ptr> iter (this->values_);
-
-  for (iter.first (); !iter.done (); iter.advance ())
-    {
-      CORBA::NamedValue_ptr *nv;
-      (void) iter.next (nv);
-      delete *nv;
-    }
-
-  this->max_ = 0;
-
-  // Remove the CDR stream if it is present.
-  delete this->incoming_;
-}
-
-// add an element and just initialize its flags
-CORBA::NamedValue_ptr
-CORBA::NVList::add (CORBA::Flags flags
-                    ACE_ENV_ARG_DECL)
-{
-  // call the helper to allocate a NamedValue element (if necessary)
-  return this->add_element (flags
-                            ACE_ENV_ARG_PARAMETER);
-}
-
-// add an element and just initialize its flags and name
-CORBA::NamedValue_ptr
-CORBA::NVList::add_item (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
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (nv)
-    {
-      // now initialize the fields
-      nv->name_ = CORBA::string_dup (name);
-      return nv;
-    }
-  else
-    {
-      return 0;
-    }
-}
-
-// add a value. If necessary, increment the list
-CORBA::NamedValue_ptr
-CORBA::NVList::add_value (const char *name,
-                          const CORBA::Any &value,
-                          CORBA::Flags flags
-                          ACE_ENV_ARG_DECL)
-{
-  // 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)
-    {
-      nv->name_ = CORBA::string_dup (name);
-
-      // 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;
-    }
-}
-
-// add an element and just initialize its flags and name
-CORBA::NamedValue_ptr
-CORBA::NVList::add_item_consume (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
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (nv)
-    {
-      // now initialize the fields
-
-      // consume the name
-      nv->name_ = name;
-      return nv;
-    }
-  else
-    {
-      return 0;
-    }
-}
-
-// add a value. If necessary, increment the list
-CORBA::NamedValue_ptr
-CORBA::NVList::add_value_consume (char * name,
-                                  CORBA::Any * value,
-                                  CORBA::Flags flags
-                                  ACE_ENV_ARG_DECL)
-{
-  // 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
-
-      // consume name
-      nv->name_ = name;
-
-      // consume the value @@ (ASG) have we? we may need to destroy
-      // the in parameter
-      nv->any_ = *value;
-      return nv;
-    }
-  else
-    {
-      return 0;
-    }
-}
-
-//CORBA::Status
-void
-CORBA::NVList::remove (CORBA::ULong /* n */
-                       ACE_ENV_ARG_DECL_NOT_USED)
-{
-  // not implemented
-  // @@ (ASG) - TODO
-}
-
-// Helper method
-CORBA::NamedValue_ptr
-CORBA::NVList::add_element (CORBA::Flags flags
-                            ACE_ENV_ARG_DECL)
-{
-  this->evaluate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::NamedValue::_nil ());
-
-  if (ACE_BIT_DISABLED (flags,
-                        CORBA::ARG_IN | CORBA::ARG_OUT | CORBA::ARG_INOUT))
-    {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (),
-                        CORBA::NamedValue::_nil ());
-    }
-
-  CORBA::NamedValue_ptr nv;
-
-  // allocate a new NamedValue
-  ACE_NEW_THROW_EX (nv,
-                    CORBA::NamedValue,
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::NamedValue::_nil ());
-
-  // set the flags and enqueue in the queue
-  nv->flags_ = flags;
-
-  if (this->values_.enqueue_tail (nv) == -1)
-    {
-      delete nv;
-      return 0;
-    }
-
-  this->max_++;
-  return nv; // success
-}
-
-// return the item at location n
-CORBA::NamedValue_ptr
-CORBA::NVList::item (CORBA::ULong n
-                     ACE_ENV_ARG_DECL)
-{
-  this->evaluate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::NamedValue::_nil ());
-
-  if (n >= this->max_)
-    {
-      ACE_THROW_RETURN (CORBA::Bounds (),
-                        CORBA::NamedValue::_nil ());
-    }
-
-  CORBA::NamedValue_ptr *nv = 0;
-
-  this->values_.get (nv, n);
-  return *nv;
-}
-
-void
-CORBA::NVList::_tao_incoming_cdr (TAO_InputCDR &cdr,
-                                  int flag,
-                                  bool &lazy_evaluation
-                                  ACE_ENV_ARG_DECL)
-{
-  // If the list is empty then using lazy evaluation is the only
-  // choice.
-  // @@ There are other cases where we can use lazy evaluation, for
-  //    example if the list is not empty but the anys own all their
-  //    objects.
-  if (lazy_evaluation == false && this->max_ == 0)
-    {
-      lazy_evaluation = true;
-    }
-
-  if (lazy_evaluation == false)
-    {
-      this->_tao_decode (cdr,
-                         flag
-                         ACE_ENV_ARG_PARAMETER);
-      return;
-    }
-
-  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
-
-  if (this->incoming_ != 0)
-    {
-      delete this->incoming_;
-      this->incoming_ = 0;
-    }
-
-  ACE_NEW (this->incoming_, TAO_InputCDR (cdr));
-  this->incoming_flag_ = flag;
-}
-
-void
-CORBA::NVList::_tao_encode (TAO_OutputCDR &cdr,
-                            int flag
-                            ACE_ENV_ARG_DECL)
-{
-  ACE_GUARD (TAO_SYNCH_MUTEX,
-             ace_mon,
-             this->lock_);
-
-  if (this->incoming_ != 0)
-    {
-      if (this->max_ == 0)
-        {
-          // The list is empty aggresively reduce copies and just send
-          // the CDR stream, we assume that
-          // TAO_Server_Request::init_reply
-          // has inserted appropiated padding already to make this
-          // operation correct
-          cdr.write_octet_array_mb (this->incoming_->start ());
-          return;
-        }
-
-      // Then unmarshal each "in" and "inout" parameter.
-      ACE_Unbounded_Queue_Iterator<CORBA::NamedValue_ptr> i (this->values_);
-
-      for (i.first (); !i.done (); i.advance ())
-        {
-          CORBA::NamedValue_ptr *item = 0;
-          (void) i.next (item);
-
-          CORBA::NamedValue_ptr nv = *item;
-
-          if (ACE_BIT_DISABLED (nv->flags (), flag))
-            {
-              continue;
-            }
-
-          if (TAO_debug_level > 3)
-            {
-              const char* arg = nv->name ();
-
-              if (arg == 0)
-                {
-                  arg = "(nil)";
-                }
-
-              ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("NVList::_tao_encode - parameter <%s>\n"),
-                          ACE_TEXT_CHAR_TO_TCHAR (arg)));
-            }
-          CORBA::TypeCode_ptr tc = nv->value ()->_tao_get_typecode ();
-          (void) TAO_Marshal_Object::perform_append (tc,
-                                                     this->incoming_,
-                                                     &cdr
-                                                     ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-        }
-
-      delete this->incoming_;
-      this->incoming_ = 0;
-      return;
-    }
-
-  // The list is already evaluated, we cannot optimize the copies, go
-  // ahead with the slow way to do things.
-
-  // Then marshal each "in" and "inout" parameter.
-  ACE_Unbounded_Queue_Iterator<CORBA::NamedValue_ptr> i (this->values_);
-
-  for (i.first (); !i.done (); i.advance ())
-    {
-      CORBA::NamedValue_ptr *item = 0;
-      (void) i.next (item);
-
-      CORBA::NamedValue_ptr nv = *item;
-
-      if (ACE_BIT_DISABLED (nv->flags (), flag))
-        {
-          continue;
-        }
-
-      nv->value ()->impl ()->marshal_value (cdr);
-    }
-}
-
-void
-CORBA::NVList::_tao_decode (TAO_InputCDR &incoming,
-                            int flag
-                            ACE_ENV_ARG_DECL)
-{
-  if (TAO_debug_level > 3)
-    {
-      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_);
-
-  for (i.first (); !i.done (); i.advance ())
-    {
-      CORBA::NamedValue_ptr *item;
-      (void) i.next (item);
-
-      CORBA::NamedValue_ptr nv = *item;
-
-      // check if it is an in or inout parameter
-      // @@ this is where we assume that the NVList is coming from
-      //    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;
-        }
-
-      if (TAO_debug_level > 3)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) : NVList::_tao_decode - %s\n"),
-                      ACE_TEXT_CHAR_TO_TCHAR (nv->name ()? nv->name () : "(no name given)" )));
-        }
-
-      CORBA::Any_ptr any = nv->value ();
-      any->impl ()->_tao_decode (incoming
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-}
-
-ptrdiff_t
-CORBA::NVList::_tao_target_alignment (void)
-{
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
-                    ace_mon,
-                    this->lock_,
-                    ACE_CDR::MAX_ALIGNMENT);
-
-  if (this->incoming_ == 0)
-    {
-      return ACE_CDR::MAX_ALIGNMENT;
-    }
-
-  const char* rd = this->incoming_->start ()->rd_ptr ();
-  ptrdiff_t t = ptrdiff_t (rd) % ACE_CDR::MAX_ALIGNMENT;
-
-  if (t < 0)
-    {
-      t += ACE_CDR::MAX_ALIGNMENT;
-    }
-
-  return t;
-}
-
-void
-CORBA::NVList::evaluate (ACE_ENV_SINGLE_ARG_DECL)
-{
-  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
-
-  if (this->incoming_ == 0)
-    {
-      return;
-    }
-
-  auto_ptr<TAO_InputCDR> incoming (this->incoming_);
-  this->incoming_ = 0;
-
-  this->_tao_decode (*(incoming.get ()),
-                     this->incoming_flag_
-                     ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Boolean
-CORBA::NVList::_lazy_has_arguments (void) const
-{
-  if (this->incoming_ != 0)
-    {
-      return this->incoming_->length () == 0 ? 0 : 1;
-    }
-  else
-    {
-      return this->count () == 0 ? 0 : 1;
-    }
-}
-
diff --git a/TAO/tao/NVList.h b/TAO/tao/NVList.h
deleted file mode 100644
index 6252b5f179a..00000000000
--- a/TAO/tao/NVList.h
+++ /dev/null
@@ -1,310 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    NVList.h
- *
- *  $Id$
- *
- *  @author  Copyright 1994-1995 by Sun Microsystems Inc.
- *  @author  Aniruddha Gokhale <gokhale@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_NVLIST_H
-#define TAO_NVLIST_H
-
-#include /**/ "ace/pre.h"
-#include "ace/CORBA_macros.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Unbounded_Queue.h"
-#include "ace/Thread_Mutex.h"
-#include "ace/Atomic_Op.h"
-
-#include "tao/CORBA_methods.h"
-#include "tao/Any.h"
-#include "tao/Environment.h"
-
-class TAO_ORB_Core;
-class TAO_InputCDR;
-
-namespace CORBA
-{
-  enum
-  {
-    // = Flags for NVList add methods
-    ARG_IN                  = 0x01,
-    ARG_OUT                 = 0x02,
-    ARG_INOUT               = 0x04,
-    IN_COPY_VALUE           = 0x08,
-    OUT_LIST_MEMORY         = 0x10,
-    DEPENDENT_LIST          = 0x20,
-
-    // = (Unused) flags for Context methods
-    CTX_RESTRICT_SCOPE      = 0x40,
-    CTX_DELETE_DESCENDENTS  = 0x80,
-
-    // = Flags for deferred synchronous methods
-    INV_NO_RESPONSE         = 0x100,
-    INV_TERM_ON_ERR         = 0x200,
-    RESP_NO_WAIT            = 0x400
-  };
-
-  class NamedValue;
-  typedef NamedValue *NamedValue_ptr;
-  typedef TAO_Pseudo_Var_T<NamedValue> NamedValue_var;
-  typedef TAO_Pseudo_Out_T<NamedValue, NamedValue_var> NamedValue_out;
-
-  typedef ULong Flags;
-
-  /**
-   * @class NamedValue
-   *
-   * @brief CORBA Name/value pair implementation.
-   *
-   * These occur only in "NVList" (named value list) data structures.
-   * The binary form of the data structure is frozen and visible to
-   * programs using it (e.g. from C).  The C++ class supports some
-   * programming discipline, e.g. to avoid memory leaks.  They just
-   * represent parameters to calls.  The name is optional, and the
-   * value is packaged as an Any.  The flags indicate parameter mode,
-   * and some ownership rules for "top level" memory.
-   */
-  class TAO_Export NamedValue
-  {
-    friend class ORB;
-    friend class NVList;
-    friend class Request;
-
-  public:
-    /// optional name
-    const char * name (void) const;
-
-    /// return the value
-    Any_ptr value (void) const;
-
-    /// return the parameter mode flag
-    Flags flags (void) const;
-
-    // The pseudo object static methods..
-    static NamedValue * _duplicate (NamedValue *);
-    static NamedValue * _nil (void);
-
-    // = Reference counting.
-    ULong _incr_refcnt (void);
-    ULong _decr_refcnt (void);
-
-    // Useful for template programming.
-    typedef NamedValue_ptr _ptr_type;
-    typedef NamedValue_var _var_type;
-
-  protected:
-
-    /// Destructor
-    /**
-     * Protected destructor to enforce proper memory management
-     * through the reference counting mechanism.
-     */
-    ~NamedValue (void);
-
-  private:
-
-    /// private constructor. Cannot be directly instantiated other than
-    /// by its friends.
-    NamedValue (void);
-
-  private:
-
-    /// Reference counter.
-    ACE_Atomic_Op<TAO_SYNCH_MUTEX, ULong> refcount_;
-
-    /// holds the value
-    Any any_;
-
-    /// parameter mode flags
-    Flags flags_;
-
-    /// optional IDL name of the parameter
-    char * name_;
-  };
-
-  // ****************************************************************
-
-  class NVList;
-  typedef NVList *NVList_ptr;
-  typedef TAO_Pseudo_Var_T<NVList> NVList_var;
-  typedef TAO_Pseudo_Out_T<NVList, NVList_var> NVList_out;
-
-  /**
-   * @class NVList
-   *
-   * @brief CORBA::NVList implementation.
-
-   * This is used in the (client side) DII (Dynamic Invocation
-   * Interface) to hold parameters, except for the return
-   * parameter. It's used in the same role in the (server side) DSI
-   * (Dynamic Skeleton Interface).
-   *
-   * Each user (client, server) provides the typecode and memory for
-   * each parameter using an NVList, then talks to the ORB using a
-   * Request or ServerRequest pseudo-object.  The ORB copies data
-   * to/from the IPC messages (e.g. IIOP::Request, IIOP::Response)
-   * as appropriate.
-   */
-  class TAO_Export NVList
-  {
-    friend class ORB;
-    friend class Request;
-
-  public:
-
-    /// return the current number of elements in the list
-    ULong count (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
-
-    /// add an element and just initialize the flags
-    NamedValue_ptr add (Flags
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    /// add an element and initialize its name and flags
-    NamedValue_ptr add_item (const char *,
-                             Flags
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    /// initializes a value, name, and flags
-    NamedValue_ptr add_value (const char *,
-                              const Any &,
-                              Flags
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    /// just like add_item. In addition, memory management of char *
-    /// name is taken over by the NVList
-    NamedValue_ptr add_item_consume (char *,
-                                     Flags
-                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    /// just like add_value. In addition, the NVList controls the
-    /// memory management of the char *name and Any *value parameter
-    NamedValue_ptr add_value_consume (char *,
-                                      Any_ptr,
-                                      Flags
-                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    /// retrieve the item at the nth location. Raises Bounds
-    NamedValue_ptr item (ULong n
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    //  CORBA::Status
-    /// remove element at index n. Raises Bounds
-    void remove (ULong n
-                 ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    // The pseudo object static methods..
-    static NVList * _duplicate (NVList *);
-    static NVList * _nil (void);
-
-    // = Reference counting.
-    ULong _incr_refcnt (void);
-    ULong _decr_refcnt (void);
-
-    // = TAO Extensions:
-
-    /**
-     * Set the incoming CDR stream, this is used by TAO to perform lazy
-     * evaluation of the NVList in an incoming ServerRequest.
-     * The <flag> is used to check which parameters (IN, OUT and/or
-     * INOUT) are to be extracted
-     */
-    void _tao_incoming_cdr (TAO_InputCDR & cdr,
-                            int flag,
-                            bool &lazy_evaluation
-                            ACE_ENV_ARG_DECL);
-
-    /// Encode the NVList into the CDR stream. <flag> masks the type of
-    /// arguments (IN, OUT or INOUT) that are to be marshaled.
-    void _tao_encode (TAO_OutputCDR & cdr,
-                      int flag
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    /// Decode the NVList arguments from the <cdr> stream.
-    void _tao_decode (TAO_InputCDR & cdr,
-                      int flag
-                      ACE_ENV_ARG_DECL);
-
-    /**
-     * Return the required alignment to marshal the NVList without any
-     * re-alignment.
-     * It returns ACE_CDR::MAX_ALIGNMENT to indicate errors.
-     */
-    ptrdiff_t _tao_target_alignment (void);
-
-    /**
-     * If this list is used by a DII request, this will tell us if
-     * our CDR stream contains any marshaled arguments (needed for
-     * GIOP 1.2).
-     */
-    Boolean _lazy_has_arguments (void) const;
-
-    // Useful for template programming.
-    typedef NVList_ptr _ptr_type;
-    typedef NVList_var _var_type;
-
-  protected:
-
-    /// Destructor
-    /**
-     * Protected destructor to enforce proper memory management
-     * through the reference counting mechanism.
-     */
-    ~NVList (void);
-
-  private:
-    /// constructor - cannot be instantiated directly other than
-    /// through the CORBA::ORB::create_list method
-    NVList (void);
-
-    /// helper to increase the list size. This is used by all the add_
-    /// methods of the NVList class
-    NamedValue_ptr add_element (Flags
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    /// Lazy evaluation routine to fill up the Anys in the NVList from
-    /// the CDR stream.
-    void evaluate (ACE_ENV_SINGLE_ARG_DECL);
-
-  private:
-    /// internal list of parameters stored as NamedValues
-    ACE_Unbounded_Queue<NamedValue_ptr> values_;
-
-    /// maximum length of list
-    ULong max_;
-
-    /// Reference counter.
-    ACE_Atomic_Op<TAO_SYNCH_MUTEX, ULong> refcount_;
-
-    /// Protects the incoming pointer.
-    TAO_SYNCH_MUTEX lock_;
-
-    /**
-     * When the NVList is used as part of a Server Request we can simply
-     * store the CDR buffer and perform lazy evaluation to compute the
-     * Anys.
-     */
-    TAO_InputCDR * incoming_;
-
-    /// The flags used to check which parameters are actually extracted
-    /// from the <incoming_> buffer
-    int incoming_flag_;
-  };
-}
-
-#if defined (__ACE_INLINE__)
-# include "tao/NVList.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_NVLIST_H */
diff --git a/TAO/tao/NVList.i b/TAO/tao/NVList.i
deleted file mode 100644
index 035279feaf6..00000000000
--- a/TAO/tao/NVList.i
+++ /dev/null
@@ -1,126 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-ACE_INLINE CORBA::Boolean
-CORBA::is_nil (CORBA::NamedValue_ptr nv)
-{
-  return nv == 0;
-}
-
-ACE_INLINE void
-CORBA::release (CORBA::NamedValue_ptr nv)
-{
-  if (nv)
-    nv->_decr_refcnt ();
-}
-
-// *************************************************************
-
-ACE_INLINE
-CORBA::NamedValue::NamedValue (void)
-  : refcount_ (1),
-    flags_ (0),
-    name_ (0)
-{
-}
-
-ACE_INLINE
-const char *
-CORBA::NamedValue::name (void) const
-{
-  return this->name_;
-}
-
-ACE_INLINE
-CORBA::Any_ptr
-CORBA::NamedValue::value (void) const
-{
-  return const_cast<CORBA::Any_ptr> (&this->any_);
-}
-
-ACE_INLINE
-CORBA::Flags
-CORBA::NamedValue::flags (void) const
-{
-  return this->flags_;
-}
-
-ACE_INLINE
-CORBA::NamedValue *
-CORBA::NamedValue::_duplicate (CORBA::NamedValue * x)
-{
-  if (x != 0)
-    {
-      x->_incr_refcnt ();
-    }
-
-  return x;
-}
-
-ACE_INLINE
-CORBA::NamedValue*
-CORBA::NamedValue::_nil (void)
-{
-  return 0;
-}
-
-// *************************************************************
-
-ACE_INLINE
-CORBA::Boolean
-CORBA::is_nil (CORBA::NVList_ptr nvl)
-{
-  return (CORBA::Boolean) (nvl == 0);
-}
-
-ACE_INLINE
-void
-CORBA::release (CORBA::NVList_ptr nvl)
-{
-  if (nvl)
-    {
-      nvl->_decr_refcnt ();
-    }
-}
-
-// ****************************************************************
-
-ACE_INLINE
-CORBA::NVList::NVList (void)
-  : max_ (0),
-    refcount_ (1),
-    incoming_ (0),
-    incoming_flag_ (0)
-{
-}
-
-ACE_INLINE
-CORBA::ULong
-CORBA::NVList::count (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  (const_cast<CORBA::NVList *> (this))->evaluate (
-    ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return this->max_;
-}
-
-ACE_INLINE
-CORBA::NVList *
-CORBA::NVList::_duplicate (CORBA::NVList * x)
-{
-  if (x != 0)
-    {
-      x->_incr_refcnt ();
-    }
-
-  return x;
-}
-
-ACE_INLINE
-CORBA::NVList *
-CORBA::NVList::_nil (void)
-{
-  return 0;
-}
diff --git a/TAO/tao/NVList_Adapter.cpp b/TAO/tao/NVList_Adapter.cpp
new file mode 100644
index 00000000000..a79fd8fde97
--- /dev/null
+++ b/TAO/tao/NVList_Adapter.cpp
@@ -0,0 +1,12 @@
+// @(#) $Id$
+
+#include "tao/NVList_Adapter.h"
+
+ACE_RCSID (tao,
+           NVList_Adapter,
+           "$Id$")
+
+TAO_NVList_Adapter::~TAO_NVList_Adapter (void)
+{
+}
+
diff --git a/TAO/tao/NVList_Adapter.h b/TAO/tao/NVList_Adapter.h
new file mode 100644
index 00000000000..207d5c2e014
--- /dev/null
+++ b/TAO/tao/NVList_Adapter.h
@@ -0,0 +1,59 @@
+// This may look like C, but it's really -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    NVList_Adapter.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_NVLIST_ADAPTER_H
+#define TAO_NVLIST_ADAPTER_H
+
+#include /**/ "ace/pre.h"
+
+#include "tao/TAO_Export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/Service_Object.h"
+#include "tao/Basic_Types.h"
+#include "ace/CORBA_macros.h"
+
+namespace CORBA
+{
+  class NVList;
+  typedef NVList *NVList_ptr;
+
+  class NamedValue;
+  typedef NamedValue *NamedValue_ptr;
+
+  class Environment;
+}
+
+/**
+ * @class TAO_NVList_Adapter
+ */
+class TAO_Export TAO_NVList_Adapter : public ACE_Service_Object
+{
+public:
+  virtual ~TAO_NVList_Adapter (void);
+
+  virtual void create_list (
+      CORBA::Long count,
+      CORBA::NVList_ptr &new_list
+      ACE_ENV_ARG_DECL) = 0;
+
+  virtual void create_named_value (
+      CORBA::NamedValue_ptr &nv
+      ACE_ENV_ARG_DECL) = 0;
+
+};
+
+#include /**/ "ace/post.h"
+#endif /* TAO_NVLIST_ADAPTER_H */
diff --git a/TAO/tao/Null_RefCount_Policy.h b/TAO/tao/Null_RefCount_Policy.h
deleted file mode 100644
index 8f8a25307cd..00000000000
--- a/TAO/tao/Null_RefCount_Policy.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Null_RefCount_Policy.h
- *
- *  $Id$
- *
- *  Header file for TAO's reference count policy (unrelated to CORBA
- *  policies).
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_NULL_REFCOUNT_POLICY_H
-#define TAO_NULL_REFCOUNT_POLICY_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TAO_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-
-  /**
-   * @class Null_RefCount_Policy
-   *
-   * @brief No-op reference counting policy.
-   *
-   * This class is intended to be used as a "policy" argument to a
-   * host class template that implements no-op reference counting.
-   * That class would then inherit privately from it like so:
-   *
-   * @code
-   *   template <class RefCountPolicy>
-   *   class MyHostClass : private RefCountPolicy
-   *   {
-   *   public:
-   *     void my_add_ref (void)    { this->RefCountPolicy::add_ref (); }
-   *     void my_remove_ref (void) { this->RefCountPolicy::remove_ref (); }
-   *   };
-   * @endcode
-   *
-   * and use it like so:
-   *
-   * @code
-   *   typedef MyHostClass<TAO::Null_RefCount_Policy> MyNonRefCountedClass;
-   *   MyNonRefCountedClass m;
-   *   ...
-   * @endcode
-   *
-   * @note In order to incur no size overhead on the host class due to
-   *       virtual tables, no base class defining an interface is
-   *       defined.  This allows C++ compilers to apply the Empty Base
-   *       Class Optimization.
-   */
-  class TAO_Export Null_RefCount_Policy
-  {
-  public:
-
-    /// No-op reference increment.
-    void add_ref (void)  { }
-
-    /// No-op reference decrement.
-    void remove_ref (void) { }
-
-  };
-
-}  // End namespace TAO
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_NULL_REFCOUNT_POLICY_H */
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index 4e0a2833fe1..1740dc23273 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -13,12 +13,12 @@ ACE_RCSID (tao,
 #include "ORB_Core.h"
 #include "ORB_Core_TSS_Resources.h"
 #include "TAO_Internal.h"
-#include "NVList.h"
 #include "Dynamic_Adapter.h"
 #include "Profile.h"
 #include "default_ports.h"
 #include "ORBInitializer_Registry_Adapter.h"
 #include "PolicyFactory_Registry_Adapter.h"
+#include "NVList_Adapter.h"
 #include "TAO_Singleton_Manager.h"
 #include "Policy_Current.h"
 #include "Policy_Manager.h"
@@ -30,11 +30,6 @@ ACE_RCSID (tao,
 #include "SystemException.h"
 #include "default_environment.h"
 
-#if TAO_HAS_INTERCEPTORS == 1
-# include "PICurrent_Loader.h"  /* @@ This should go away! */
-# include "PICurrent.h"  /* @@ This should go away! */
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
 #if !defined (__ACE_INLINE__)
 # include "ORB.i"
 #endif /* ! __ACE_INLINE__ */
@@ -111,7 +106,7 @@ CORBA::Exception *CORBA::ORB::InvalidName::_alloc (void)
 CORBA::Exception *
 CORBA::ORB::InvalidName::_tao_duplicate (void) const
 {
-  CORBA::Exception *result;
+  CORBA::Exception *result = 0;
   ACE_NEW_RETURN (
       result,
       ::CORBA::ORB::InvalidName (*this),
@@ -289,38 +284,21 @@ CORBA::ORB::create_list (CORBA::Long count,
                          CORBA::NVList_ptr &new_list
                          ACE_ENV_ARG_DECL)
 {
-  ACE_ASSERT (CORBA::ULong (count) <= UINT_MAX);
-
-  // Create an empty list
-  ACE_NEW_THROW_EX (new_list,
-                    CORBA::NVList,
-                    CORBA::NO_MEMORY (
-                      CORBA::SystemException::_tao_minor_code (
-                        0,
-                        ENOMEM),
-                      CORBA::COMPLETED_NO));
-  ACE_CHECK;
+  TAO_NVList_Adapter *adapter =
+    ACE_Dynamic_Service<TAO_NVList_Adapter>::instance (
+        "TAO_NVList_Adapter"
+      );
 
-  // If count is greater than 0, create a list of NamedValues.
-  if (count != 0)
+  if (adapter == 0)
     {
-      new_list->max_ = (CORBA::ULong) count;
-
-      for (CORBA::Long i = 0; i < count; ++i)
-        {
-          CORBA::NamedValue_ptr nv = 0;
-          ACE_NEW_THROW_EX (nv,
-                            CORBA::NamedValue,
-                            CORBA::NO_MEMORY (
-                              CORBA::SystemException::_tao_minor_code (
-                                0,
-                                ENOMEM),
-                              CORBA::COMPLETED_NO));
-          ACE_CHECK;
-
-          new_list->values_.enqueue_tail (nv);
-        }
+      ACE_ERROR ((LM_ERROR,
+                  ACE_TEXT ("(%P|%t) %p\n"),
+                  ACE_TEXT ("ORB unable to find the ")
+                  ACE_TEXT ("NVList Adapter instance")));
+      ACE_THROW (CORBA::INTERNAL ());
     }
+
+  adapter->create_list (count, new_list ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -375,13 +353,22 @@ void
 CORBA::ORB::create_named_value (CORBA::NamedValue_ptr &nv
                                 ACE_ENV_ARG_DECL)
 {
-  ACE_NEW_THROW_EX (nv,
-                    CORBA::NamedValue,
-                    CORBA::NO_MEMORY (
-                      CORBA::SystemException::_tao_minor_code (
-                        0,
-                        ENOMEM),
-                      CORBA::COMPLETED_NO));
+  TAO_NVList_Adapter *adapter =
+    ACE_Dynamic_Service<TAO_NVList_Adapter>::instance (
+        "TAO_NVList_Adapter"
+      );
+
+  if (adapter == 0)
+    {
+      ACE_ERROR ((LM_ERROR,
+                  ACE_TEXT ("(%P|%t) %p\n"),
+                  ACE_TEXT ("ORB unable to find the ")
+                  ACE_TEXT ("NVList Adapter instance")));
+
+      ACE_THROW (CORBA::INTERNAL ());
+    }
+
+  adapter->create_named_value (nv ACE_ENV_ARG_PARAMETER);
 }
 
 // The following functions are not implemented - they just throw
@@ -1614,13 +1601,6 @@ CORBA::ORB_init (int &argc,
                                           slotid
                                           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::ORB::_nil ());
-
-#if TAO_HAS_INTERCEPTORS == 1
-      TAO::PICurrent *pi = oc->pi_current ();
-
-      if (pi != 0)
-        pi->initialize (slotid);
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
     }
 
   if (TAO_debug_level > 2)
diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h
index 1fa5acbe664..803d857d6f0 100644
--- a/TAO/tao/ORB.h
+++ b/TAO/tao/ORB.h
@@ -30,6 +30,9 @@
 #include "Policy_ForwardC.h"
 #include "CORBA_methods.h"
 #include "VarOut_T.h"
+#include "Seq_Var_T.h"
+#include "Seq_Out_T.h"
+#include "Sequence_T.h"
 
 #include "ace/Thread_Mutex.h"
 #include "ace/Guard_T.h"
@@ -76,6 +79,14 @@ namespace CORBA
   class NVList;
   typedef NVList *NVList_ptr;
 
+  class NamedValue;
+  typedef NamedValue *NamedValue_ptr;
+
+  class Policy;
+  typedef Policy *Policy_ptr;
+
+  typedef CORBA::ULong PolicyType;
+
   // TODO - implement OMG's 'ORBid CORBA::ORB::id (void)'.
 
   typedef
diff --git a/TAO/tao/ORBInitializer_Registry_Adapter.h b/TAO/tao/ORBInitializer_Registry_Adapter.h
index 3ce462fea29..ffd9b863d58 100644
--- a/TAO/tao/ORBInitializer_Registry_Adapter.h
+++ b/TAO/tao/ORBInitializer_Registry_Adapter.h
@@ -82,13 +82,15 @@ namespace TAO
        * @param argc Number of arguments
        * @param argv Argv array
        * @param slotid The slot id
+       * @param picurrent PI Current, if this is not null, the concrete
+       * implementation will update the slot id
        */
       virtual void post_init (
         size_t pre_init_count,
         TAO_ORB_Core *orb_core,
         int argc,
         char *argv[],
-        PortableInterceptor::SlotId &slotid
+        PortableInterceptor::SlotId slotid
         ACE_ENV_ARG_DECL) = 0;
   };
 }
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index bce6daa608b..e0bc632002e 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -57,6 +57,7 @@
 
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_string.h"
+#include "ace/Message_Block.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 # include "tao/ClientRequestInterceptor_Adapter.h"
@@ -79,7 +80,7 @@ ACE_RCSID (tao,
 CORBA::Environment&
 TAO_default_environment (void)
 {
-  return *TAO_TSS_RESOURCES::instance ()->default_environment_;
+  return *TAO_TSS_Resources::instance ()->default_environment_;
 }
 
 // ****************************************************************
@@ -195,7 +196,7 @@ TAO_ORB_Core::TAO_ORB_Core (const char *orbid)
     policy_factory_registry_ (0),
     orbinitializer_registry_ (0),
 #if (TAO_HAS_INTERCEPTORS == 1)
-    pi_current_ (0),
+    pi_current_ (CORBA::Object::_nil ()),
     client_request_interceptor_adapter_ (0),
     server_request_interceptor_adapter_ (0),
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
@@ -1303,15 +1304,15 @@ TAO_ORB_Core::set_resource_factory (const char *resource_factory_name)
 void
 TAO_ORB_Core::set_gui_resource_factory (TAO::GUIResource_Factory *gui_resource_factory)
 {
-  if (TAO_TSS_RESOURCES::instance ()->gui_resource_factory_ != 0)
+  if (TAO_TSS_Resources::instance ()->gui_resource_factory_ != 0)
     {
 
       ACE_DEBUG ((LM_WARNING,
                   "TAO (%P|%t) - Deleting old gui_resource_factory.\n"));
-      delete TAO_TSS_RESOURCES::instance ()->gui_resource_factory_;
+      delete TAO_TSS_Resources::instance ()->gui_resource_factory_;
     }
 
-  TAO_TSS_RESOURCES::instance ()->gui_resource_factory_ = gui_resource_factory;
+  TAO_TSS_Resources::instance ()->gui_resource_factory_ = gui_resource_factory;
 }
 
 void
@@ -1394,7 +1395,7 @@ TAO_ORB_Core::resource_factory (void)
 TAO::GUIResource_Factory *
 TAO_ORB_Core::gui_resource_factory (void)
 {
-  return TAO_TSS_RESOURCES::instance ()->gui_resource_factory_;
+  return TAO_TSS_Resources::instance ()->gui_resource_factory_;
 }
 
 
@@ -2083,7 +2084,6 @@ TAO_ORB_Core::shutdown (CORBA::Boolean wait_for_completion
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       CORBA::release (this->pi_current_);
-      this->pi_current_ = 0;  // For the sake of consistency.
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
     }
   ACE_CATCHALL
@@ -2257,7 +2257,7 @@ TAO_ORB_Core::resolve_picurrent_i (ACE_ENV_SINGLE_ARG_DECL)
     {
       ACE_Service_Config::process_directive (
         ACE_DYNAMIC_SERVICE_DIRECTIVE("PICurrent_Loader",
-                                      "TAO",
+                                      "TAO_PI",
                                       "_make_TAO_PICurrent_Loader",
                                       ""));
       loader =
@@ -2270,7 +2270,7 @@ TAO_ORB_Core::resolve_picurrent_i (ACE_ENV_SINGLE_ARG_DECL)
         loader->create_object (this->orb_, 0, 0 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      this->pi_current_ = dynamic_cast <TAO::PICurrent *> (pi);
+      this->pi_current_ = pi;
     }
 }
 
@@ -2844,13 +2844,13 @@ TAO_ORB_Core::get_cached_policy_including_current (
 CORBA::Environment *
 TAO_ORB_Core::default_environment (void) const
 {
-  return TAO_TSS_RESOURCES::instance ()->default_environment_;
+  return TAO_TSS_Resources::instance ()->default_environment_;
 }
 
 void
 TAO_ORB_Core::default_environment (CORBA::Environment *env)
 {
-  TAO_TSS_RESOURCES::instance ()->default_environment_ = env;
+  TAO_TSS_Resources::instance ()->default_environment_ = env;
 }
 
 void
diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h
index 524d1811834..a7d565fe3f7 100644
--- a/TAO/tao/ORB_Core.h
+++ b/TAO/tao/ORB_Core.h
@@ -40,8 +40,6 @@
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-#include "tao/PICurrent.h"
-
 namespace TAO
 {
   class ClientRequestInterceptor_Adapter;
@@ -55,6 +53,8 @@ namespace TAO
 #include "ace/TSS_T.h"
 
 // Forward declarations
+class ACE_Data_Block;
+
 class TAO_Adapter;
 class TAO_Acceptor;
 class TAO_Connector;
@@ -190,10 +190,10 @@ public:
   void poa_current (CORBA::Object_ptr poa_current);
   //@}
 
-  ///Get the connector registry
+  /// Get the connector registry
   TAO_Connector_Registry *connector_registry (ACE_ENV_SINGLE_ARG_DECL);
 
-  ///Get the IOR parser registry
+  /// Get the IOR parser registry
   TAO_Parser_Registry *parser_registry (void);
 
   /// Return pointer to the policy factory registry associated with
@@ -413,7 +413,6 @@ public:
   /// locking strategies.
   ACE_Data_Block *create_input_cdr_data_block (size_t size);
 
-
   /// Return the locking strategy used for the data blocks.
   ACE_Lock *locking_strategy (void);
 
@@ -787,10 +786,10 @@ public:
 #if TAO_HAS_INTERCEPTORS == 1
 
   /// Return a pointer to the cached TAO::PICurrent object.
-  TAO::PICurrent *pi_current (void);
+  CORBA::Object_ptr pi_current (void);
 
   /// Set the pointer to the cached TAO::PICurrent object.
-  void pi_current (TAO::PICurrent *current);
+  void pi_current (CORBA::Object_ptr current);
 
   /// Register a client request interceptor.
   void add_interceptor (
@@ -1166,7 +1165,7 @@ protected:
    * invocation path).  Caching it prevents additional overhead to due
    * object resolution from occurring.
    */
-  TAO::PICurrent *pi_current_;
+  CORBA::Object_ptr pi_current_;
 
   /// The adapter for handling client request interceptors
   TAO::ClientRequestInterceptor_Adapter *client_request_interceptor_adapter_;
diff --git a/TAO/tao/ORB_Core.i b/TAO/tao/ORB_Core.i
index 60b9a0db058..a5dc61de082 100644
--- a/TAO/tao/ORB_Core.i
+++ b/TAO/tao/ORB_Core.i
@@ -602,7 +602,7 @@ TAO_ORB_Core::resolve_rt_orb (void)
 }
 
 #if (TAO_HAS_INTERCEPTORS == 1)
-ACE_INLINE TAO::PICurrent *
+ACE_INLINE CORBA::Object_ptr
 TAO_ORB_Core::pi_current (void)
 {
   // A pointer/reference to PICurrent is cached in the ORB Core since
@@ -613,7 +613,7 @@ TAO_ORB_Core::pi_current (void)
 }
 
 ACE_INLINE void
-TAO_ORB_Core::pi_current (TAO::PICurrent *current)
+TAO_ORB_Core::pi_current (CORBA::Object_ptr current)
 {
   // Not duplicated since the ORB Core's "object_ref_table" already
   // contains a duplicate of the PICurrent object.
diff --git a/TAO/tao/ORB_Core_Auto_Ptr.h b/TAO/tao/ORB_Core_Auto_Ptr.h
index 52aa611502b..f99c4f79a9d 100644
--- a/TAO/tao/ORB_Core_Auto_Ptr.h
+++ b/TAO/tao/ORB_Core_Auto_Ptr.h
@@ -33,7 +33,9 @@ class TAO_Export TAO_ORB_Core_Auto_Ptr
 {
 public:
 
-  /// Initialization and termination methods
+  /**
+   * @name Initialization and termination methods
+   */
   //@{
   explicit TAO_ORB_Core_Auto_Ptr (TAO_ORB_Core *p = 0);
   TAO_ORB_Core_Auto_Ptr (TAO_ORB_Core_Auto_Ptr &ap);
@@ -41,7 +43,9 @@ public:
   ~TAO_ORB_Core_Auto_Ptr (void);
   //@}
 
-  /// Accessor methods.
+  /**
+   * @name Accessor methods.
+   */
   //@{
   TAO_ORB_Core &operator *() const;
   TAO_ORB_Core *get (void) const;
diff --git a/TAO/tao/ORB_Core_TSS_Resources.cpp b/TAO/tao/ORB_Core_TSS_Resources.cpp
index 400ab9ff947..a9d364e90f2 100644
--- a/TAO/tao/ORB_Core_TSS_Resources.cpp
+++ b/TAO/tao/ORB_Core_TSS_Resources.cpp
@@ -9,9 +9,6 @@ TAO_ORB_Core_TSS_Resources::TAO_ORB_Core_TSS_Resources (void)
   , ts_objects_ ()
   , upcalls_temporarily_suspended_on_this_thread_ (false)
   , orb_core_ (0)
-#if TAO_HAS_INTERCEPTORS == 1
-    , pi_current_ ()
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
 {
 }
 
diff --git a/TAO/tao/ORB_Core_TSS_Resources.h b/TAO/tao/ORB_Core_TSS_Resources.h
index 0853605a831..9488216500e 100644
--- a/TAO/tao/ORB_Core_TSS_Resources.h
+++ b/TAO/tao/ORB_Core_TSS_Resources.h
@@ -27,10 +27,6 @@
 
 class TAO_ORB_Core;
 
-#if TAO_HAS_INTERCEPTORS == 1
-#include "PICurrent_Impl.h"
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
 /**
  * @class TAO_ORB_Core_TSS_Resources
  *
@@ -85,11 +81,6 @@ public:
   /// cleanup functions for the TSS objects stored in the TSS object
   /// array in this class.
   TAO_ORB_Core *orb_core_;
-
-#if TAO_HAS_INTERCEPTORS == 1
-  /// The thread-specific portion of the PICurrent object.
-  TAO::PICurrent_Impl pi_current_;
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
 };
 
 
diff --git a/TAO/tao/ORB_Table.h b/TAO/tao/ORB_Table.h
index d527c79377a..1b35ae545b0 100644
--- a/TAO/tao/ORB_Table.h
+++ b/TAO/tao/ORB_Table.h
@@ -78,7 +78,9 @@ namespace TAO
     typedef Table::size_type  size_type;
     typedef Table::iterator   iterator;
 
-    /// The canonical ACE_Map methods.
+    /**
+     * @name The canonical ACE_Map methods.
+     */
     //@{
     iterator begin (void);
     iterator end (void);
diff --git a/TAO/tao/ObjRefTemplate.mpc b/TAO/tao/ObjRefTemplate.mpc
index 77150719a80..b4abf145b34 100644
--- a/TAO/tao/ObjRefTemplate.mpc
+++ b/TAO/tao/ObjRefTemplate.mpc
@@ -27,6 +27,9 @@ project : valuetype, portableserver, core {
     ObjRefTemplate
   }
 
+  IDL_Files {
+  }
+
   Pkgconfig_Files {
     ObjRefTemplate/TAO_ObjRefTemplate.pc.in
   }
diff --git a/TAO/tao/ObjRefTemplate/Default_ORTA.cpp b/TAO/tao/ObjRefTemplate/Default_ORTA.cpp
index 9be9852ca99..b78d8423c3f 100644
--- a/TAO/tao/ObjRefTemplate/Default_ORTA.cpp
+++ b/TAO/tao/ObjRefTemplate/Default_ORTA.cpp
@@ -26,15 +26,15 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "Default_ORTC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Value_TypeCode_Static.h"
-#include "tao/TypeCode_Value_Field.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Value_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Value_Field.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
 
 // TAO_IDL - Generated from
 // be/be_visitor_typecode/value_typecode.cpp:50
@@ -54,7 +54,7 @@ static TAO::TypeCode::Value<char const *,
     &CORBA::_tc_null,
     _tao_fields_TAO_Default_ORT_ObjectReferenceTemplate,
     0);
-  
+
 namespace TAO_Default_ORT
 {
   ::CORBA::TypeCode_ptr const _tc_ObjectReferenceTemplate =
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp
index 1c230c1fa55..3ee1ad6f6d7 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp
@@ -26,17 +26,17 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "ObjectReferenceTemplate.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Value_TypeCode_Static.h"
-#include "tao/TypeCode_Value_Field.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Sequence_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Value_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Value_Field.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
 // be/be_visitor_typecode/value_typecode.cpp:50
@@ -56,7 +56,7 @@ static TAO::TypeCode::Value<char const *,
     &CORBA::_tc_null,
     _tao_fields_PortableInterceptor_ObjectReferenceFactory,
     0);
-  
+
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_ObjectReferenceFactory =
@@ -83,7 +83,7 @@ static TAO::TypeCode::Value<char const *,
     &CORBA::_tc_null,
     _tao_fields_PortableInterceptor_ObjectReferenceTemplate,
     0);
-  
+
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_ObjectReferenceTemplate =
@@ -113,10 +113,10 @@ namespace TAO
         CORBA::tk_sequence,
         &PortableInterceptor::_tc_ObjectReferenceTemplate,
         0U);
-      
+
     ::CORBA::TypeCode_ptr const tc_PortableInterceptor_ObjectReferenceTemplateSeq_0 =
       &PortableInterceptor_ObjectReferenceTemplateSeq_0;
-    
+
   }
 }
 
@@ -130,7 +130,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/PortableInterceptor/ObjectReferenceTemplateSeq:1.0",
     "ObjectReferenceTemplateSeq",
     &TAO::TypeCode::tc_PortableInterceptor_ObjectReferenceTemplateSeq_0);
-  
+
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_ObjectReferenceTemplateSeq =
@@ -259,7 +259,7 @@ operator>>= (
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be/be_visitor_sequence/any_op_cs.cpp:54
 
 
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp
index 3c6be414aa1..9ffbc54f337 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp
@@ -53,20 +53,21 @@
 // Arg traits specializations.
 namespace TAO
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:489
 
 #if !defined (_CORBA_STRINGSEQ__ARG_TRAITS_CS_)
 #define _CORBA_STRINGSEQ__ARG_TRAITS_CS_
-  
+
   template<>
   class Arg_Traits<CORBA::StringSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::StringSeq,
             CORBA::StringSeq_var,
-            CORBA::StringSeq_out
+            CORBA::StringSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::StringSeq>
           >
   {
   };
@@ -139,29 +140,29 @@ CORBA::Boolean PortableInterceptor::ObjectReferenceFactory::_tao_unmarshal (
         base,
         ObjectReferenceFactory::_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 = ObjectReferenceFactory::_downcast (base);
diff --git a/TAO/tao/VisibilityC.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_includeA.h
index dea87ac4d8f..fbf583b4fef 100644
--- a/TAO/tao/VisibilityC.cpp
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_includeA.h
@@ -26,44 +26,41 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:390
 
+#ifndef _TAO_IDL_ORIG_OBJECTREFERENCETEMPLATE_INCLUDEA_H_
+#define _TAO_IDL_ORIG_OBJECTREFERENCETEMPLATE_INCLUDES_H_
 
-#include "VisibilityC.h"
-#include "tao/CDR.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
+#include /**/ "ace/pre.h"
+
+#include "tao/ObjRefTemplate/ObjectReferenceTemplate_includeC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
 
 #if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:70
+// be\be_codegen.cpp:999
 
-// Arg traits specializations.
-namespace TAO
-{
-}
 
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_Visibility (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/Visibility:1.0",
-    "Visibility",
-    &CORBA::_tc_short);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_Visibility =
-    &_tao_tc_CORBA_Visibility;
-}
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
 
+#include /**/ "ace/post.h"
+#endif /* ifndef */
 
diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp
index 37c9a8008bc..15580b19b63 100644
--- a/TAO/tao/Object.cpp
+++ b/TAO/tao/Object.cpp
@@ -1007,48 +1007,6 @@ namespace TAO
   {
     return p->marshal (cdr);
   }
-
-//============================================================================
-  using namespace CORBA;
-
-  CORBA::Boolean
-  Ret_Object_Argument_T<Object_ptr,Object_var>::demarshal (TAO_InputCDR &cdr)
-  {
-    return cdr >> this->x_.out ();
-  }
-
-  void
-  Ret_Object_Argument_T<Object_ptr,Object_var>::interceptor_result (CORBA::Any * )
-  {
-    if (TAO_debug_level > 2)
-      {
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) - Cannot insert a vanilla CORBA Object"
-                    " into an Any for returning the return argument \n"));
-      }
-  }
-
-  Ret_Object_Argument_T<Object_ptr,Object_var>::Ret_Object_Argument_T (void)
-  {
-  }
-
-  Object_ptr &
-  Ret_Object_Argument_T<Object_ptr,Object_var>::arg (void)
-  {
-    return this->x_.out ();
-  }
-
-  Object_ptr
-  Ret_Object_Argument_T<Object_ptr,Object_var>::excp (void)
-  {
-    return this->x_.ptr ();
-  }
-
-  Object_ptr
-  Ret_Object_Argument_T<Object_ptr,Object_var>::retn (void)
-  {
-    return this->x_._retn ();
-  }
 } // close TAO namespace
 
 
diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h
index cad1d111e00..548cf871edd 100644
--- a/TAO/tao/Object.h
+++ b/TAO/tao/Object.h
@@ -31,6 +31,7 @@
 #include "tao/Pseudo_VarOut_T.h"
 #include "tao/Object_Argument_T.h"
 #include "tao/Arg_Traits_T.h"
+#include "tao/Any_Insert_Policy_T.h"
 
 #if defined (HPUX) && defined (IOR)
    /* HP-UX 11.11 defines IOR in /usr/include/pa/inline.h
@@ -427,7 +428,8 @@ namespace TAO
     : public Object_Arg_Traits_T<CORBA::Object_ptr,
                                  CORBA::Object_var,
                                  CORBA::Object_out,
-                                 TAO::Objref_Traits<CORBA::Object> >
+                                 TAO::Objref_Traits<CORBA::Object>,
+                                 TAO::Any_Insert_Policy_CORBA_Object <CORBA::Object_ptr> >
   {
   };
 
@@ -440,35 +442,8 @@ namespace TAO
     static CORBA::Boolean marshal (CORBA::Object_ptr p,
                                    TAO_OutputCDR & cdr);
   };
-
-  /**
-   * @class Ret_Object_Argument_T
-   *
-   * @brief Specialization for CORBA::Object, necessitated since we
-   *  don't have an Any insertion operator for Object.
-   */
-  template<>
-  class TAO_Export Ret_Object_Argument_T <CORBA::Object_ptr, CORBA::Object_var>
-    : public Argument
-  {
-  public:
-    Ret_Object_Argument_T (void);
-
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-
-    virtual void interceptor_result (CORBA::Any *);
-
-    CORBA::Object_ptr & arg (void);
-
-    CORBA::Object_ptr excp (void);
-    CORBA::Object_ptr retn (void);
-
-  private:
-    CORBA::Object_var x_;
-  };
 }
 
-
 /// This function pointer is set only when the Portable server
 /// library is present.
 extern
diff --git a/TAO/tao/ObjectIdListA.cpp b/TAO/tao/ObjectIdListA.cpp
deleted file mode 100644
index db1e3a6e222..00000000000
--- a/TAO/tao/ObjectIdListA.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-// -*- 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/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "ObjectIdListC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ORB_ObjectId (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ORB_ObjectId:1.0",
-    "ORB_ObjectId",
-    &CORBA::_tc_string);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ORB_ObjectId =
-    &_tao_tc_CORBA_ORB_ObjectId;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_CORBA_ORB_ObjectIdList_GUARD
-#define _TAO_TYPECODE_CORBA_ORB_ObjectIdList_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ORB_ObjectIdList_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_ORB_ObjectId,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ORB_ObjectIdList_0 =
-      &CORBA_ORB_ObjectIdList_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ORB_ObjectIdList_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ORB_ObjectIdList (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ORB_ObjectIdList:1.0",
-    "ORB_ObjectIdList",
-    &TAO::TypeCode::tc_CORBA_ORB_ObjectIdList_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ORB_ObjectIdList =
-    &_tao_tc_CORBA_ORB_ObjectIdList;
-}
-
diff --git a/TAO/tao/ObjectIdListC.h b/TAO/tao/ObjectIdListC.h
index f0d4cc61ce3..41ec5807c6d 100644
--- a/TAO/tao/ObjectIdListC.h
+++ b/TAO/tao/ObjectIdListC.h
@@ -66,34 +66,29 @@
 
 namespace CORBA
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:413
-  
+
   typedef char * ORB_ObjectId;
   typedef CORBA::String_var ORB_ObjectId_var;
   typedef CORBA::String_out ORB_ObjectId_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ORB_ObjectId;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_ORB_OBJECTIDLIST_CH_)
 #define _CORBA_ORB_OBJECTIDLIST_CH_
-  
+
   class ORB_ObjectIdList;
-  
+
   typedef
     TAO_MngSeq_Var_T<
         ORB_ObjectIdList,
         TAO_SeqElem_String_Manager
       >
     ORB_ObjectIdList_var;
-  
+
   typedef
     TAO_MngSeq_Out_T<
         ORB_ObjectIdList,
@@ -101,7 +96,7 @@ namespace CORBA
         TAO_SeqElem_String_Manager
       >
     ORB_ObjectIdList_out;
-  
+
   class TAO_Export ORB_ObjectIdList
     : public
         TAO_Unbounded_String_Sequence
@@ -112,21 +107,16 @@ namespace CORBA
     ORB_ObjectIdList (
         CORBA::ULong max,
         CORBA::ULong length,
-        char ** buffer, 
+        char ** buffer,
         CORBA::Boolean release = 0
       );
     ORB_ObjectIdList (const ORB_ObjectIdList &);
     ~ORB_ObjectIdList (void);
-    
+
     typedef ORB_ObjectIdList_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ORB_ObjectIdList;
 
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:66
diff --git a/TAO/tao/Object_Argument_T.cpp b/TAO/tao/Object_Argument_T.cpp
index db3a85f5329..9d949775999 100644
--- a/TAO/tao/Object_Argument_T.cpp
+++ b/TAO/tao/Object_Argument_T.cpp
@@ -4,7 +4,6 @@
 #define TAO_OBJECT_ARGUMENT_T_C
 
 #include "tao/Object_Argument_T.h"
-#include "tao/Dynamic_ParameterC.h"
 
 #if !defined (__ACE_INLINE__)
 #include "tao/Object_Argument_T.inl"
@@ -14,37 +13,36 @@ ACE_RCSID (tao,
            Object_Argument_T,
            "$Id$")
 
-template<typename S_ptr>
+template<typename S_ptr, typename Insert_Policy>
 CORBA::Boolean
-TAO::In_Object_Argument_T<S_ptr>::marshal (TAO_OutputCDR & cdr)
+TAO::In_Object_Argument_T<S_ptr,Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << this->x_;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S_ptr>
+template<typename S_ptr, typename Insert_Policy>
 void
-TAO::In_Object_Argument_T<S_ptr>::interceptor_param (Dynamic::Parameter & p)
+TAO::In_Object_Argument_T<S_ptr,Insert_Policy>::interceptor_value (CORBA::Any *any) const
 {
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_IN;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ===========================================================
 
-template<typename S_ptr, typename S_traits>
+template<typename S_ptr, typename S_traits, typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_Object_Argument_T<S_ptr,S_traits>::marshal (TAO_OutputCDR & cdr)
+TAO::Inout_Object_Argument_T<S_ptr,S_traits,Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << this->x_;
 }
 
-template<typename S_ptr, typename S_traits>
+template<typename S_ptr, typename S_traits, typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_Object_Argument_T<S_ptr,S_traits>::demarshal (TAO_InputCDR & cdr)
+TAO::Inout_Object_Argument_T<S_ptr,S_traits,Insert_Policy>::demarshal (TAO_InputCDR & cdr)
 {
   S_traits::release (this->x_);
   return cdr >> this->x_;
@@ -52,57 +50,54 @@ TAO::Inout_Object_Argument_T<S_ptr,S_traits>::demarshal (TAO_InputCDR & cdr)
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S_ptr, typename S_traits>
+template<typename S_ptr, typename S_traits, typename Insert_Policy>
 void
-TAO::Inout_Object_Argument_T<S_ptr,S_traits>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::Inout_Object_Argument_T<S_ptr,S_traits,Insert_Policy>::interceptor_value (
+    CORBA::Any *any) const
 {
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_INOUT;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ==============================================================
 
-template<typename S_ptr, typename S_out>
+template<typename S_ptr, typename S_out, typename Insert_Policy>
 CORBA::Boolean
-TAO::Out_Object_Argument_T<S_ptr,S_out>::demarshal (TAO_InputCDR & cdr)
+TAO::Out_Object_Argument_T<S_ptr,S_out,Insert_Policy>::demarshal (TAO_InputCDR & cdr)
 {
   return cdr >> this->x_;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S_ptr, typename S_out>
+template<typename S_ptr, typename S_out, typename Insert_Policy>
 void
-TAO::Out_Object_Argument_T<S_ptr,S_out>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::Out_Object_Argument_T<S_ptr,S_out,Insert_Policy>::interceptor_value (
+    CORBA::Any *any) const
 {
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_OUT;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ============================================================
 
-template<typename S_ptr, typename S_var>
+template<typename S_ptr, typename S_var, typename Insert_Policy>
 CORBA::Boolean
-TAO::Ret_Object_Argument_T<S_ptr,S_var>::demarshal (TAO_InputCDR & cdr)
+TAO::Ret_Object_Argument_T<S_ptr,S_var,Insert_Policy>::demarshal (TAO_InputCDR & cdr)
 {
   return cdr >> this->x_.out ();
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S_ptr, typename S_var>
+template<typename S_ptr, typename S_var, typename Insert_Policy>
 void
-TAO::Ret_Object_Argument_T<S_ptr,S_var>::interceptor_result (CORBA::Any * any)
+TAO::Ret_Object_Argument_T<S_ptr,S_var,Insert_Policy>::interceptor_value (
+    CORBA::Any *any) const
 {
-  (*any) <<= this->x_.in ();
+  this->Insert_Policy::any_insert (any, this->x_.in ());
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
diff --git a/TAO/tao/Object_Argument_T.h b/TAO/tao/Object_Argument_T.h
index 2e2d86fb2a3..b5157e3616f 100644
--- a/TAO/tao/Object_Argument_T.h
+++ b/TAO/tao/Object_Argument_T.h
@@ -22,11 +22,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-// This set of classes is also used by valuetype arguments. If the
-// specialization is done using S * for the parameter, the semantics
-// are the same as for interfaces, so there's no need for another
-// set of classes.
-
 namespace TAO
 {
   /**
@@ -35,15 +30,15 @@ namespace TAO
    * @brief Template class for IN object argument.
    *
    */
-  template<typename S_ptr>
-  class In_Object_Argument_T : public Argument
+  template<typename S_ptr, typename Insert_Policy>
+  class In_Object_Argument_T : public InArgument, private Insert_Policy
   {
   public:
     In_Object_Argument_T (S_ptr x);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S_ptr arg (void) const;
 
@@ -57,16 +52,16 @@ namespace TAO
    * @brief Template class for INOUT object argument.
    *
    */
-  template<typename S_ptr, typename S_traits>
-  class Inout_Object_Argument_T : public Argument
+  template<typename S_ptr, typename S_traits, typename Insert_Policy>
+  class Inout_Object_Argument_T : public InoutArgument, private Insert_Policy
   {
   public:
     Inout_Object_Argument_T (S_ptr & x);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+    virtual CORBA::Boolean demarshal (TAO_InputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S_ptr & arg (void);
 
@@ -77,18 +72,18 @@ namespace TAO
   /**
    * @class Out_Object_Argument_T
    *
-   * @brief Template class for INOUT object argument.
+   * @brief Template class for OUT object argument.
    *
    */
-  template<typename S_ptr, typename S_out>
-  class Out_Object_Argument_T : public Argument
+  template<typename S_ptr, typename S_out, typename Insert_Policy>
+  class Out_Object_Argument_T : public OutArgument, private Insert_Policy
   {
   public:
     Out_Object_Argument_T (S_out & x);
 
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
+    virtual CORBA::Boolean demarshal (TAO_InputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S_out arg (void);
 
@@ -102,8 +97,8 @@ namespace TAO
    * @brief Template class for return stub value of object argument.
    *
    */
-  template<typename S_ptr, typename S_var>
-  class Ret_Object_Argument_T : public Argument
+  template<typename S_ptr, typename S_var, typename Insert_Policy>
+  class Ret_Object_Argument_T : public RetArgument, private Insert_Policy
   {
   public:
 
@@ -111,7 +106,7 @@ namespace TAO
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_result (CORBA::Any *);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S_ptr & arg (void);
 
@@ -131,13 +126,11 @@ namespace TAO
   struct TAO_Export Object_Tag {};
 
   /**
-   * @struct Basic_Arg_Traits_T
+   * @struct Object_Arg_Traits_T
    *
    * @brief Template class for stub argument traits of objects.
-   *
    */
-
-  template<typename T_ptr, typename T_var, typename T_out, typename T_traits>
+  template<typename T_ptr, typename T_var, typename T_out, typename T_traits, typename Insert_Policy>
   struct Object_Arg_Traits_T
   {
     typedef T_ptr                                         ret_type;
@@ -145,10 +138,14 @@ namespace TAO
     typedef T_ptr &                                       inout_type;
     typedef T_out                                         out_type;
 
-    typedef In_Object_Argument_T<T_ptr>                   in_arg_val;
-    typedef Inout_Object_Argument_T<T_ptr, T_traits>      inout_arg_val;
-    typedef Out_Object_Argument_T<T_ptr,T_out>            out_arg_val;
-    typedef Ret_Object_Argument_T<T_ptr,T_var>            ret_val;
+    typedef In_Object_Argument_T<T_ptr, Insert_Policy>
+      in_arg_val;
+    typedef Inout_Object_Argument_T<T_ptr, T_traits, Insert_Policy>
+      inout_arg_val;
+    typedef Out_Object_Argument_T<T_ptr,T_out, Insert_Policy>
+      out_arg_val;
+    typedef Ret_Object_Argument_T<T_ptr,T_var, Insert_Policy>
+      ret_val;
 
     typedef Object_Tag                                    idl_tag;
   };
diff --git a/TAO/tao/Object_Argument_T.inl b/TAO/tao/Object_Argument_T.inl
index feb64a6af6e..b4a778c9299 100644
--- a/TAO/tao/Object_Argument_T.inl
+++ b/TAO/tao/Object_Argument_T.inl
@@ -2,81 +2,81 @@
 //
 // $Id$
 
-template<typename S_ptr>
+template<typename S_ptr, typename Insert_Policy>
 ACE_INLINE
-TAO::In_Object_Argument_T<S_ptr>::In_Object_Argument_T (S_ptr x)
+TAO::In_Object_Argument_T<S_ptr,Insert_Policy>::In_Object_Argument_T (S_ptr x)
   : x_ (x)
 {}
 
-template<typename S_ptr>
+template<typename S_ptr, typename Insert_Policy>
 ACE_INLINE
 S_ptr
-TAO::In_Object_Argument_T<S_ptr>::arg (void) const
+TAO::In_Object_Argument_T<S_ptr,Insert_Policy>::arg (void) const
 {
   return this->x_;
 }
 
 // ==========================================================================
 
-template<typename S_ptr, typename S_traits>
+template<typename S_ptr, typename S_traits, typename Insert_Policy>
 ACE_INLINE
-TAO::Inout_Object_Argument_T<S_ptr,S_traits>::Inout_Object_Argument_T (
+TAO::Inout_Object_Argument_T<S_ptr,S_traits,Insert_Policy>::Inout_Object_Argument_T (
     S_ptr & x
   )
   : x_ (x)
 {}
 
-template<typename S_ptr, typename S_traits>
+template<typename S_ptr, typename S_traits, typename Insert_Policy>
 ACE_INLINE
 S_ptr &
-TAO::Inout_Object_Argument_T<S_ptr,S_traits>::arg (void)
+TAO::Inout_Object_Argument_T<S_ptr,S_traits,Insert_Policy>::arg (void)
 {
   return this->x_;
 }
 
 // ==========================================================================
 
-template<typename S_ptr, typename S_out>
+template<typename S_ptr, typename S_out, typename Insert_Policy>
 ACE_INLINE
-TAO::Out_Object_Argument_T<S_ptr,S_out>::Out_Object_Argument_T (S_out & x)
+TAO::Out_Object_Argument_T<S_ptr,S_out,Insert_Policy>::Out_Object_Argument_T (S_out & x)
   : x_ (x.ptr ())
 {}
 
-template<typename S_ptr, typename S_out>
+template<typename S_ptr, typename S_out, typename Insert_Policy>
 ACE_INLINE
 S_out
-TAO::Out_Object_Argument_T<S_ptr,S_out>::arg (void)
+TAO::Out_Object_Argument_T<S_ptr,S_out,Insert_Policy>::arg (void)
 {
   return this->x_;
 }
 
 // ==========================================================================
 
-template<typename S_ptr, typename S_var>
+template<typename S_ptr, typename S_var, typename Insert_Policy>
 ACE_INLINE
-TAO::Ret_Object_Argument_T<S_ptr,S_var>::Ret_Object_Argument_T (void)
+TAO::Ret_Object_Argument_T<S_ptr,S_var,Insert_Policy>::Ret_Object_Argument_T (void)
 {}
 
-template<typename S_ptr, typename S_var>
+template<typename S_ptr, typename S_var, typename Insert_Policy>
 ACE_INLINE
 S_ptr &
-TAO::Ret_Object_Argument_T<S_ptr,S_var>::arg (void)
+TAO::Ret_Object_Argument_T<S_ptr,S_var,Insert_Policy>::arg (void)
 {
   return this->x_.out ();
 }
 
-template<typename S_ptr, typename S_var>
+template<typename S_ptr, typename S_var, typename Insert_Policy>
 ACE_INLINE
 S_ptr
-TAO::Ret_Object_Argument_T<S_ptr,S_var>::excp (void)
+TAO::Ret_Object_Argument_T<S_ptr,S_var,Insert_Policy>::excp (void)
 {
   return this->x_.ptr ();
 }
 
-template<typename S_ptr, typename S_var>
+template<typename S_ptr, typename S_var, typename Insert_Policy>
 ACE_INLINE
 S_ptr
-TAO::Ret_Object_Argument_T<S_ptr,S_var>::retn (void)
+TAO::Ret_Object_Argument_T<S_ptr,S_var,Insert_Policy>::retn (void)
 {
   return this->x_._retn ();
 }
diff --git a/TAO/tao/Object_KeyC.cpp b/TAO/tao/Object_KeyC.cpp
index 1c6754f5847..3f46183a1f5 100644
--- a/TAO/tao/Object_KeyC.cpp
+++ b/TAO/tao/Object_KeyC.cpp
@@ -157,7 +157,7 @@ TAO::ObjectKey::decode_string_to_sequence (TAO_Unbounded_Sequence<CORBA::Octet>
       return;
     }
 
-  u_int length = ACE_OS::strlen (str);
+  size_t length = ACE_OS::strlen (str);
   const char *eos = str + length;
   const char *cp = str;
 
diff --git a/TAO/tao/Objref_TypeCode.cpp b/TAO/tao/Objref_TypeCode.cpp
deleted file mode 100644
index 03c5b129e63..00000000000
--- a/TAO/tao/Objref_TypeCode.cpp
+++ /dev/null
@@ -1,153 +0,0 @@
-// $Id$
-
-#ifndef TAO_OBJREF_TYPECODE_CPP
-#define TAO_OBJREF_TYPECODE_CPP
-
-#include "tao/Objref_TypeCode.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/Objref_TypeCode.inl"
-#endif  /* !__ACE_INLINE__ */
-
-#include "tao/CDR.h"
-
-#include "ace/OS_NS_string.h"
-
-
-template <typename StringType, class RefCountPolicy>
-bool
-TAO::TypeCode::Objref<StringType, RefCountPolicy>::tao_marshal (
-  TAO_OutputCDR & cdr,
-  CORBA::ULong) const
-{
-  // A tk_objref TypeCode has a "complex" parameter list type (see
-  // Table 15-2 in Section 15.3.5.1 "TypeCode" in the CDR section of
-  // the CORBA specification), meaning that it must be marshaled into
-  // a CDR encapsulation.
-
-  // Create a CDR encapsulation.
-  TAO_OutputCDR enc;
-
-  return
-    enc << TAO_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER)
-    && enc << TAO_OutputCDR::from_string (this->attributes_.id (), 0)
-    && enc << TAO_OutputCDR::from_string (this->attributes_.name (), 0)
-    && cdr << static_cast<CORBA::ULong> (enc.total_length ())
-    && cdr.write_octet_array_mb (enc.begin ());
-}
-
-template <typename StringType, class RefCountPolicy>
-void
-TAO::TypeCode::Objref<StringType, RefCountPolicy>::tao_duplicate (void)
-{
-  this->RefCountPolicy::add_ref ();
-}
-
-template <typename StringType, class RefCountPolicy>
-void
-TAO::TypeCode::Objref<StringType, RefCountPolicy>::tao_release (void)
-{
-  this->RefCountPolicy::remove_ref ();
-}
-
-template <typename StringType, class RefCountPolicy>
-CORBA::Boolean
-TAO::TypeCode::Objref<StringType, RefCountPolicy>::equal_i (
-  CORBA::TypeCode_ptr /* tc */
-  ACE_ENV_ARG_DECL_NOT_USED) const
-{
-  // Equality has already been established in the
-  // CORBA::TypeCode base class.
-
-  return true;
-}
-
-template <typename StringType, class RefCountPolicy>
-CORBA::Boolean
-TAO::TypeCode::Objref<StringType, RefCountPolicy>::equivalent_i (
-  CORBA::TypeCode_ptr
-  ACE_ENV_ARG_DECL_NOT_USED) const
-{
-  // Equivalence already verified in the base class
-  // CORBA::TypeCode::equivalent() method.
-
-  return true;
-}
-
-template <typename StringType, class RefCountPolicy>
-CORBA::TypeCode_ptr
-TAO::TypeCode::Objref<StringType,
-                      RefCountPolicy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
-{
-  TAO_TypeCodeFactory_Adapter * const adapter =
-    ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-        TAO_ORB_Core::typecodefactory_adapter_name ()
-      );
-
-  if (adapter == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        CORBA::TypeCode::_nil ());
-    }
-
-  if (this->kind_ == CORBA::tk_abstract_interface)
-    {
-      return adapter->create_abstract_interface_tc (this->attributes_.id (),
-                                                    ""  /* empty name */
-                                                    ACE_ENV_ARG_PARAMETER);
-    }
-  else if (this->kind_ == CORBA::tk_component)
-    {
-      return adapter->create_component_tc (this->attributes_.id (),
-                                           ""  /* empty name */
-                                           ACE_ENV_ARG_PARAMETER);
-    }
-  else if (this->kind_ == CORBA::tk_home)
-    {
-      return adapter->create_home_tc (this->attributes_.id (),
-                                      ""  /* empty name */
-                                      ACE_ENV_ARG_PARAMETER);
-    }
-  else if (this->kind_ == CORBA::tk_local_interface)
-    {
-      return adapter->create_local_interface_tc (this->attributes_.id (),
-                                                 ""  /* empty name */
-                                                 ACE_ENV_ARG_PARAMETER);
-
-    }
-  else if (this->kind_ == CORBA::tk_native)
-    {
-      return adapter->create_native_tc (this->attributes_.id (),
-                                        ""  /* empty name */
-                                        ACE_ENV_ARG_PARAMETER);
-    }
-  else // CORBA::tk_objref
-    {
-      return adapter->create_interface_tc (this->attributes_.id (),
-                                           ""  /* empty name */
-                                           ACE_ENV_ARG_PARAMETER);
-    }
-}
-
-template <typename StringType, class RefCountPolicy>
-char const *
-TAO::TypeCode::Objref<StringType, RefCountPolicy>::id_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->attributes_.id ();
-}
-
-template <typename StringType, class RefCountPolicy>
-char const *
-TAO::TypeCode::Objref<StringType, RefCountPolicy>::name_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->attributes_.name ();
-}
-
-#endif  /*  TAO_OBJREF_TYPECODE_CPP */
diff --git a/TAO/tao/Objref_TypeCode.h b/TAO/tao/Objref_TypeCode.h
deleted file mode 100644
index 0f49b5d99f7..00000000000
--- a/TAO/tao/Objref_TypeCode.h
+++ /dev/null
@@ -1,122 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Objref_TypeCode.h
- *
- *  $Id$
- *
- *  Header file for
- *    @c tk_abstract_interface,
- *    @c tk_component,
- *    @c tk_home,
- *    @c tk_local_interface,
- *    @c tk_native and
- *    @c tk_objref
- *  @c CORBA::TypeCodes.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_OBJREF_TYPECODE_H
-#define TAO_OBJREF_TYPECODE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TypeCode.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TypeCode_Base_Attributes.h"
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    /**
-     * @class Objref_Base
-     *
-     * @brief @c CORBA::TypeCode implementation for an OMG IDL
-     *        @c object and object-like types.
-     *
-     * This class implements a @c CORBA::TypeCode for an OMG IDL
-     * @c object (interface) and object-like types (abstract
-     * interface, component, home, local interface and native).
-     */
-    template <typename StringType, class RefCountPolicy>
-    class Objref
-      : public CORBA::TypeCode,
-        private RefCountPolicy
-    {
-    public:
-
-      /// Constructor.
-      Objref (CORBA::TCKind kind,
-              char const * id,
-              char const * name);
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
-      //@}
-
-    protected:
-
-      /**
-       * @name @c TAO CORBA::TypeCode Template Methods
-       *
-       * @c tk_abstract_interface, @c tk_component, @c
-       * tk_local_interface, @c tk_native and @c tk_objref
-       * @c CORBA::TypeCode -specific template methods.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    protected:
-
-      /// Base attributes (@c id and @c name).
-      Base_Attributes<StringType> attributes_;
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/Objref_TypeCode.inl"
-#endif  /* __ACE_INLINE__ */
-
-#ifdef ACE_TEMPLATES_REQUIRE_SOURCE
-# include "tao/Objref_TypeCode.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
-# pragma implementation ("Objref_TypeCode.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_OBJREF_TYPECODE_H */
diff --git a/TAO/tao/Objref_TypeCode.inl b/TAO/tao/Objref_TypeCode.inl
deleted file mode 100644
index e40aa1e10d9..00000000000
--- a/TAO/tao/Objref_TypeCode.inl
+++ /dev/null
@@ -1,16 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-
-template <typename StringType, class RefCountPolicy>
-ACE_INLINE
-TAO::TypeCode::Objref<StringType, RefCountPolicy>::Objref (
-  CORBA::TCKind kind,
-  char const * id,
-  char const * name)
-  : CORBA::TypeCode (kind)
-  , RefCountPolicy ()
-  , attributes_ (id, name)
-{
-}
diff --git a/TAO/tao/Objref_TypeCode_Static.cpp b/TAO/tao/Objref_TypeCode_Static.cpp
deleted file mode 100644
index fb2e89240a3..00000000000
--- a/TAO/tao/Objref_TypeCode_Static.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-// $Id$
-
-#include "tao/Objref_TypeCode_Static.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/Objref_TypeCode_Static.inl"
-#endif  /* !__ACE_INLINE__ */
-
-#include "tao/CDR.h"
-#include "tao/TypeCodeFactory_Adapter.h"
-#include "tao/ORB_Core.h"
-
-#include "ace/Dynamic_Service.h"
-#include "ace/OS_NS_string.h"
-
-
-ACE_RCSID (tao,
-           Objref_TypeCode_Static,
-           "$Id$")
-
-
-bool
-TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::tao_marshal (
-  TAO_OutputCDR & cdr,
-  CORBA::ULong) const
-{
-  // A tk_objref TypeCode has a "complex" parameter list type (see
-  // Table 15-2 in Section 15.3.5.1 "TypeCode" in the CDR section of
-  // the CORBA specification), meaning that it must be marshaled into
-  // a CDR encapsulation.
-
-  // Create a CDR encapsulation.
-  TAO_OutputCDR enc;
-
-  return
-    enc << TAO_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER)
-    && enc << TAO_OutputCDR::from_string (this->attributes_.id (), 0)
-    && enc << TAO_OutputCDR::from_string (this->attributes_.name (), 0)
-    && cdr << static_cast<CORBA::ULong> (enc.total_length ())
-    && cdr.write_octet_array_mb (enc.begin ());
-}
-
-void
-TAO::TypeCode::Objref<char const *,
-                      TAO::Null_RefCount_Policy>::tao_duplicate (void)
-{
-}
-
-void
-TAO::TypeCode::Objref<char const *,
-                      TAO::Null_RefCount_Policy>::tao_release (void)
-{
-}
-
-CORBA::Boolean
-TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::equal_i (
-  CORBA::TypeCode_ptr /* tc */
-  ACE_ENV_ARG_DECL_NOT_USED) const
-{
-  // Equality has already been established in the
-  // CORBA::TypeCode base class.
-
-  return true;
-}
-
-CORBA::Boolean
-TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::equivalent_i (
-  CORBA::TypeCode_ptr
-  ACE_ENV_ARG_DECL_NOT_USED) const
-{
-  // Equivalence already verified in the base class
-  // CORBA::TypeCode::equivalent() method.
-
-  return true;
-}
-
-CORBA::TypeCode_ptr
-TAO::TypeCode::Objref<char const *,
-                      TAO::Null_RefCount_Policy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
-{
-  TAO_TypeCodeFactory_Adapter * const adapter =
-    ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-        TAO_ORB_Core::typecodefactory_adapter_name ()
-      );
-
-  if (adapter == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        CORBA::TypeCode::_nil ());
-    }
-
-  if (this->kind_ == CORBA::tk_abstract_interface)
-    {
-      return adapter->create_abstract_interface_tc (this->attributes_.id (),
-                                                    ""  /* empty name */
-                                                    ACE_ENV_ARG_PARAMETER);
-    }
-  else if (this->kind_ == CORBA::tk_component)
-    {
-      return adapter->create_component_tc (this->attributes_.id (),
-                                           ""  /* empty name */
-                                           ACE_ENV_ARG_PARAMETER);
-    }
-  else if (this->kind_ == CORBA::tk_home)
-    {
-      return adapter->create_home_tc (this->attributes_.id (),
-                                      ""  /* empty name */
-                                      ACE_ENV_ARG_PARAMETER);
-    }
-  else if (this->kind_ == CORBA::tk_local_interface)
-    {
-      return adapter->create_local_interface_tc (this->attributes_.id (),
-                                                 ""  /* empty name */
-                                                 ACE_ENV_ARG_PARAMETER);
-
-    }
-  else if (this->kind_ == CORBA::tk_native)
-    {
-      return adapter->create_native_tc (this->attributes_.id (),
-                                        ""  /* empty name */
-                                        ACE_ENV_ARG_PARAMETER);
-    }
-  else // CORBA::tk_objref
-    {
-      return adapter->create_interface_tc (this->attributes_.id (),
-                                           ""  /* empty name */
-                                           ACE_ENV_ARG_PARAMETER);
-    }
-}
-
-char const *
-TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::id_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->attributes_.id ();
-}
-
-char const *
-TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::name_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->attributes_.name ();
-}
-
diff --git a/TAO/tao/Objref_TypeCode_Static.h b/TAO/tao/Objref_TypeCode_Static.h
deleted file mode 100644
index 69e86efe82b..00000000000
--- a/TAO/tao/Objref_TypeCode_Static.h
+++ /dev/null
@@ -1,118 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Objref_TypeCode_Static.h
- *
- *  $Id$
- *
- *  Header file for static
- *    @c tk_abstract_interface,
- *    @c tk_component,
- *    @c tk_home,
- *    @c tk_local_interface,
- *    @c tk_native and
- *    @c tk_objref
- *  @c CORBA::TypeCodes.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_OBJREF_TYPECODE_STATIC_H
-#define TAO_OBJREF_TYPECODE_STATIC_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TypeCode.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TypeCode_Base_Attributes.h"
-#include "tao/Null_RefCount_Policy.h"
-
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    template <typename StringType, class RefCountPolicy> class Objref;
-
-    /**
-     * @class Objref
-     *
-     * @brief @c CORBA::TypeCode implementation for an OMG IDL
-     *        @c object and object-like types.
-     *
-     * This class implements a @c CORBA::TypeCode for an OMG IDL
-     * @c object (interface) and object-like types (abstract
-     * interface, component, home, local interface and native).
-     */
-    template<>
-    class TAO_Export Objref<char const *, TAO::Null_RefCount_Policy>
-      : public CORBA::TypeCode,
-        private TAO::Null_RefCount_Policy
-    {
-    public:
-
-      /// Constructor.
-      Objref (CORBA::TCKind kind,
-              char const * id,
-              char const * name);
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
-      //@}
-
-    protected:
-
-      /**
-       * @name @c TAO CORBA::TypeCode Template Methods
-       *
-       * @c tk_abstract_interface, @c tk_component, @c
-       * tk_local_interface, @c tk_native and @c tk_objref
-       * @c CORBA::TypeCode -specific template methods.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    protected:
-
-      /// Base attributes (@c id and @c name).
-      Base_Attributes<char const *> attributes_;
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/Objref_TypeCode_Static.inl"
-#endif  /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_OBJREF_TYPECODE_STATIC_H */
diff --git a/TAO/tao/Objref_TypeCode_Static.inl b/TAO/tao/Objref_TypeCode_Static.inl
deleted file mode 100644
index 07c5d36ece2..00000000000
--- a/TAO/tao/Objref_TypeCode_Static.inl
+++ /dev/null
@@ -1,15 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-
-ACE_INLINE
-TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::Objref (
-  CORBA::TCKind kind,
-  char const * id,
-  char const * name)
-  : CORBA::TypeCode (kind)
-  , ACE_NESTED_CLASS (TAO, Null_RefCount_Policy) ()
-  , attributes_ (id, name)
-{
-}
diff --git a/TAO/tao/OctetSeq.pidl b/TAO/tao/OctetSeq.pidl
index e1f1cb3850f..e0d27947f2a 100644
--- a/TAO/tao/OctetSeq.pidl
+++ b/TAO/tao/OctetSeq.pidl
@@ -2,21 +2,25 @@
 //
 // $Id$
 
-// ================================================================
-//
-//   This file was used to generate the code in OctetSeqC.*
-//   The command used to generate code is:
-//
-//     tao_idl
-//        -o orig -Ge 1 -GA -Sc -SS -Sci
-//          -Wb,export_macro=TAO_Export
-//          -Wb,pre_include="ace/pre.h"
-//          -Wb,post_include="ace/post.h"
-//          OctetSeq.pidl
-//
-//   Patches for changes to the generated code are available in the
-//   `diffs' directory.
-// ================================================================
+/**
+ *
+ *   This file was used to generate the code in OctetSeqC.*
+ *   The command used to generate code is:
+ *
+ *     tao_idl
+ *          -oA AnyTypeCode
+ *          -Ge 1 -GA -Sc -SS -Sci
+ *          -Wb,pre_include=ace/pre.h
+ *          -Wb,post_include=ace/post.h
+ *          -Wb,export_macro=TAO_Export
+ *          -Wb,export_include=tao/TAO_Export.h
+ *          -Wb,anyop_export_macro=TAO_AnyTypeCode_Export
+ *          -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h
+ *          OctetSeq.pidl
+ *
+ *   Patches for changes to the generated code are available in the
+ *   `diffs' directory.
+ */
 
 
 #ifndef TAO_CORBA_OCTET_SEQ_IDL
diff --git a/TAO/tao/OctetSeqA.cpp b/TAO/tao/OctetSeqA.cpp
deleted file mode 100644
index e81a0d009be..00000000000
--- a/TAO/tao/OctetSeqA.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-// -*- 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/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "OctetSeqC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_CORBA_OctetSeq_GUARD
-#define _TAO_TYPECODE_CORBA_OctetSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_OctetSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_octet,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_OctetSeq_0 =
-      &CORBA_OctetSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_OctetSeq_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_OctetSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/OctetSeq:1.0",
-    "OctetSeq",
-    &TAO::TypeCode::tc_CORBA_OctetSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_OctetSeq =
-    &_tao_tc_CORBA_OctetSeq;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::OctetSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::OctetSeq>::insert_copy (
-      _tao_any,
-      CORBA::OctetSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_OctetSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::OctetSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::OctetSeq>::insert (
-      _tao_any,
-      CORBA::OctetSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_OctetSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::OctetSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::OctetSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::OctetSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::OctetSeq>::extract (
-        _tao_any,
-        CORBA::OctetSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_OctetSeq_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/OctetSeqC.cpp b/TAO/tao/OctetSeqC.cpp
index 0e00b3c9aaf..c59ead52d2b 100644
--- a/TAO/tao/OctetSeqC.cpp
+++ b/TAO/tao/OctetSeqC.cpp
@@ -26,17 +26,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:288
 
 
 #include "OctetSeqC.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__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
diff --git a/TAO/tao/OctetSeqC.h b/TAO/tao/OctetSeqC.h
index 860e2422858..5fa4471699b 100644
--- a/TAO/tao/OctetSeqC.h
+++ b/TAO/tao/OctetSeqC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_OCTETSEQC_H_
-#define _TAO_IDL_ORIG_OCTETSEQC_H_
+#ifndef _TAO_IDL_OCTETSEQC_H_
+#define _TAO_IDL_OCTETSEQC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -57,31 +57,27 @@
 #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
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace CORBA
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_OCTETSEQ_CH_)
 #define _CORBA_OCTETSEQ_CH_
-  
+
   class OctetSeq;
-  
+
   typedef
     TAO_FixedSeq_Var_T<
         OctetSeq,
         CORBA::Octet
       >
     OctetSeq_var;
-  
+
   typedef
     TAO_Seq_Out_T<
         OctetSeq,
@@ -89,7 +85,7 @@ namespace CORBA
         CORBA::Octet
       >
     OctetSeq_out;
-  
+
   class TAO_Export OctetSeq
     : public
         TAO_Unbounded_Sequence<
@@ -102,14 +98,14 @@ namespace CORBA
     OctetSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        CORBA::Octet* buffer, 
+        CORBA::Octet* buffer,
         CORBA::Boolean release = 0
       );
     OctetSeq (const OctetSeq &);
     ~OctetSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef OctetSeq_var _var_type;
 
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
@@ -122,14 +118,9 @@ namespace CORBA
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_OctetSeq;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module CORBA
 
@@ -153,13 +144,6 @@ namespace TAO
   template class TAO_Export TAO_Unbounded_Sequence<CORBA::OctetSeq>;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */
 
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::OctetSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::OctetSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::OctetSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::OctetSeq *&);
 
 // TAO_IDL - Generated from
 // be\be_visitor_sequence/cdr_op_ch.cpp:71
@@ -179,16 +163,12 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_OctetSeq_H_ */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
+// be\be_codegen.cpp:1062
 
 #if defined(_MSC_VER)
 #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/PI.mpc b/TAO/tao/PI.mpc
index 80535eb629b..ac39d912cd7 100644
--- a/TAO/tao/PI.mpc
+++ b/TAO/tao/PI.mpc
@@ -27,6 +27,9 @@ project : taolib, codecfactory, core {
     PI
   }
 
+  IDL_Files {
+  }
+
   Pkgconfig_Files {
     PI/TAO_PI.pc.in
   }
diff --git a/TAO/tao/PI/ClientRequestInfo.cpp b/TAO/tao/PI/ClientRequestInfo.cpp
index d5c7271f555..6105ebb0cb6 100644
--- a/TAO/tao/PI/ClientRequestInfo.cpp
+++ b/TAO/tao/PI/ClientRequestInfo.cpp
@@ -4,21 +4,25 @@
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-
 ACE_RCSID (tao,
            ClientRequestInfo,
            "$Id$")
 
-#include "tao/Any.h"
+#include "PICurrent.h"
+#include "RequestInfo_Util.h"
+
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/ExceptionA.h"
 #include "tao/PolicyC.h"
 #include "tao/PortableInterceptorC.h"
-#include "tao/PICurrent.h"
 #include "tao/Invocation_Base.h"
+#include "tao/operation_details.h"
 #include "tao/Stub.h"
 #include "tao/ORB_Core.h"
 #include "tao/Profile.h"
 #include "tao/debug.h"
 #include "tao/Service_Context.h"
+#include "tao/Exception_Data.h"
 
 TAO_ClientRequestInfo::TAO_ClientRequestInfo (TAO::Invocation_Base *inv)
   : invocation_ (inv),
@@ -32,9 +36,12 @@ void
 TAO_ClientRequestInfo::setup_picurrent (void)
 {
   // Retrieve the thread scope current (no TSS access incurred yet).
-  TAO::PICurrent *pi_current =
+  CORBA::Object_ptr pi_current_obj =
     this->invocation_->orb_core ()->pi_current ();
 
+  TAO::PICurrent *pi_current =
+    dynamic_cast <TAO::PICurrent*> (pi_current_obj);
+
   // If the slot count is zero, then there is nothing to copy.
   // Prevent any copying (and hence TSS accesses) from occurring.
   if (pi_current != 0 && pi_current->slot_count () != 0)
@@ -456,7 +463,8 @@ TAO_ClientRequestInfo::operation (ACE_ENV_SINGLE_ARG_DECL)
   this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  return CORBA::string_dup (this->invocation_->operation_name ());
+  return CORBA::string_dup (
+    this->invocation_->operation_details ().opname  ());
 }
 
 Dynamic::ParameterList *
@@ -466,7 +474,38 @@ TAO_ClientRequestInfo::arguments (ACE_ENV_SINGLE_ARG_DECL)
   this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  return this->invocation_->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
+  // 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;
+
+  if (this->parameter_list (*parameter_list) == false)
+    ACE_THROW_RETURN (CORBA::MARSHAL (),
+                      0);
+
+  return safe_parameter_list._retn ();
+
+  //return this->invocation_->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
+}
+
+bool
+TAO_ClientRequestInfo::parameter_list (Dynamic::ParameterList &param_list)
+{
+  // Account for the return type that could be in the argument list.
+  param_list.length (this->invocation_->operation_details ().args_num () - 1);
+
+  for (CORBA::ULong i = 1; i != this->invocation_->operation_details ().args_num (); ++i)
+    {
+      TAO::Argument *argument =
+        this->invocation_->operation_details ().args ()[i];
+      Dynamic::Parameter &p = param_list[i - 1];
+      p.mode = argument->mode ();
+      argument->interceptor_value (&p.argument);
+    }
+
+  return true;
 }
 
 Dynamic::ExceptionList *
@@ -476,7 +515,37 @@ TAO_ClientRequestInfo::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  return this->invocation_->exceptions (ACE_ENV_SINGLE_ARG_PARAMETER);
+  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;
+
+  if (this->exception_list (*exception_list) == false)
+    ACE_THROW_RETURN (CORBA::MARSHAL (),
+                      0);
+
+  return safe_exception_list._retn ();
+}
+
+bool
+TAO_ClientRequestInfo::exception_list (Dynamic::ExceptionList &exception_list)
+{
+
+  if (this->invocation_->operation_details ().ex_count ())
+    {
+      exception_list.length (this->invocation_->operation_details ().ex_count ());
+
+      for (CORBA::ULong i = 0;
+           i != this->invocation_->operation_details ().ex_count ();
+           ++i)
+        {
+          CORBA::TypeCode_ptr tcp = this->invocation_->operation_details ().ex_data ()[i].tc_ptr;
+          TAO_Pseudo_Object_Manager<CORBA::TypeCode> tcp_object (&tcp, 1);
+          exception_list[i] = tcp_object;
+        }
+    }
+  return true;
 }
 
 Dynamic::ContextList *
@@ -510,7 +579,28 @@ TAO_ClientRequestInfo::result (ACE_ENV_SINGLE_ARG_DECL)
   this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  return this->invocation_->result (ACE_ENV_SINGLE_ARG_PARAMETER);
+  // Generate the result on demand.
+  static const 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;
+
+  if (this->result (result_any) == false)
+    ACE_THROW_RETURN (CORBA::MARSHAL (),
+                      0);
+
+  return safe_result_any._retn ();
+}
+
+bool
+TAO_ClientRequestInfo::result (CORBA::Any *any)
+{
+  for (CORBA::ULong i = 0; i != this->invocation_->operation_details ().args_num (); ++i)
+    (*this->invocation_->operation_details ().args ()[i]).interceptor_value (any);
+
+  return true;
 }
 
 CORBA::Boolean
@@ -530,7 +620,7 @@ TAO_ClientRequestInfo::sync_scope (ACE_ENV_SINGLE_ARG_DECL)
   this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  return this->invocation_->sync_scope ();
+  return this->invocation_->operation_details ().response_flags ();
 }
 
 PortableInterceptor::ReplyStatus
diff --git a/TAO/tao/PI/ClientRequestInfo.h b/TAO/tao/PI/ClientRequestInfo.h
index 5fc84ad5e5f..b3391bf247d 100644
--- a/TAO/tao/PI/ClientRequestInfo.h
+++ b/TAO/tao/PI/ClientRequestInfo.h
@@ -33,10 +33,10 @@
 
 #include "ClientRequestInfoC.h"
 #include "PIForwardRequestC.h"
+#include "PICurrent_Impl.h"
+#include "PICurrent_Copy_Callback.h"
 #include "tao/ORB_Constants.h"
 #include "tao/Invocation_Utils.h"
-#include "tao/PICurrent_Impl.h"
-#include "tao/PICurrent_Copy_Callback.h"
 
 class TAO_Service_Context;
 
@@ -219,6 +219,12 @@ public:
 
 private:
 
+  bool parameter_list (Dynamic::ParameterList &param_list);
+
+  bool exception_list (Dynamic::ExceptionList &exception_list);
+
+  bool result (CORBA::Any *any);
+
   /// Check if this ClientRequestInfo object is called within the
   /// context of a request.
   void check_validity (ACE_ENV_SINGLE_ARG_DECL);
diff --git a/TAO/tao/PI/ClientRequestInfoA.cpp b/TAO/tao/PI/ClientRequestInfoA.cpp
index 75245ee97ed..f6840ced1f9 100644
--- a/TAO/tao/PI/ClientRequestInfoA.cpp
+++ b/TAO/tao/PI/ClientRequestInfoA.cpp
@@ -26,14 +26,14 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "ClientRequestInfoC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/objref_typecode.cpp:76
@@ -44,7 +44,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/PortableInterceptor/ClientRequestInfo:1.0",
     "ClientRequestInfo");
-  
+
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_ClientRequestInfo =
@@ -77,7 +77,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<PortableInterceptor::ClientRequestInfo>::demarshal_value (TAO_InputCDR &)
diff --git a/TAO/tao/PI/ClientRequestInfoC.h b/TAO/tao/PI/ClientRequestInfoC.h
index 9a5becb6f4a..d9c265ec99b 100644
--- a/TAO/tao/PI/ClientRequestInfoC.h
+++ b/TAO/tao/PI/ClientRequestInfoC.h
@@ -45,9 +45,9 @@
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Any.h"
-#include "tao/TypeCode.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/Objref_VarOut_T.h"
 
 #include "tao/PI/RequestInfoC.h"
@@ -73,22 +73,22 @@
 
 namespace PortableInterceptor
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__VAR_OUT_CH_
-  
+
   class ClientRequestInfo;
   typedef ClientRequestInfo *ClientRequestInfo_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ClientRequestInfo
       >
     ClientRequestInfo_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ClientRequestInfo
@@ -96,95 +96,95 @@ namespace PortableInterceptor
     ClientRequestInfo_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO_CH_
-  
+
   class TAO_PI_Export ClientRequestInfo
     : public virtual ::PortableInterceptor::RequestInfo
   {
   public:
     typedef ClientRequestInfo_ptr _ptr_type;
     typedef ClientRequestInfo_var _var_type;
-    
+
     // The static operations.
     static ClientRequestInfo_ptr _duplicate (ClientRequestInfo_ptr obj);
-    
+
     static void _tao_release (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 static_cast<ClientRequestInfo_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // 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
     // 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
     // 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
     // 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
     // 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
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::IOP::TaggedComponent * get_effective_component (
         ::IOP::ComponentId id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -192,10 +192,10 @@ namespace PortableInterceptor
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::IOP::TaggedComponentSeq * get_effective_components (
         ::IOP::ComponentId id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -203,10 +203,10 @@ namespace PortableInterceptor
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::Policy_ptr get_request_policy (
         ::CORBA::PolicyType type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -214,10 +214,10 @@ namespace PortableInterceptor
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void add_request_service_context (
         const ::IOP::ServiceContext & service_context,
         ::CORBA::Boolean replace
@@ -226,36 +226,36 @@ namespace PortableInterceptor
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     ClientRequestInfo (void);
-    
+
     virtual ~ClientRequestInfo (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     ClientRequestInfo (const ClientRequestInfo &);
-    
+
     void operator= (const ClientRequestInfo &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   extern TAO_PI_Export ::CORBA::TypeCode_ptr const _tc_ClientRequestInfo;
 
 // TAO_IDL - Generated from
@@ -272,7 +272,7 @@ namespace TAO
 
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__TRAITS_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__TRAITS_CH_
-  
+
   template<>
   struct TAO_PI_Export Objref_Traits< ::PortableInterceptor::ClientRequestInfo>
   {
diff --git a/TAO/tao/PI/ClientRequestInterceptorA.cpp b/TAO/tao/PI/ClientRequestInterceptorA.cpp
index 37540f43dbc..a74dc65102d 100644
--- a/TAO/tao/PI/ClientRequestInterceptorA.cpp
+++ b/TAO/tao/PI/ClientRequestInterceptorA.cpp
@@ -26,14 +26,14 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "ClientRequestInterceptorC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/objref_typecode.cpp:76
@@ -44,7 +44,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/PortableInterceptor/ClientRequestInterceptor:1.0",
     "ClientRequestInterceptor");
-  
+
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_ClientRequestInterceptor =
@@ -77,7 +77,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<PortableInterceptor::ClientRequestInterceptor>::demarshal_value (TAO_InputCDR &)
diff --git a/TAO/tao/PI/InterceptorA.cpp b/TAO/tao/PI/InterceptorA.cpp
index d386dfcfff3..ce25543d0a6 100644
--- a/TAO/tao/PI/InterceptorA.cpp
+++ b/TAO/tao/PI/InterceptorA.cpp
@@ -26,14 +26,14 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "InterceptorC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/objref_typecode.cpp:76
@@ -44,7 +44,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/PortableInterceptor/Interceptor:1.0",
     "Interceptor");
-  
+
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_Interceptor =
@@ -77,7 +77,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<PortableInterceptor::Interceptor>::demarshal_value (TAO_InputCDR &)
diff --git a/TAO/tao/InvalidSlot.pidl b/TAO/tao/PI/InvalidSlot.pidl
index bd82c726aa5..bd82c726aa5 100644
--- a/TAO/tao/InvalidSlot.pidl
+++ b/TAO/tao/PI/InvalidSlot.pidl
diff --git a/TAO/tao/InvalidSlotA.cpp b/TAO/tao/PI/InvalidSlotA.cpp
index 265b0414b41..b4f76a7cbd6 100644
--- a/TAO/tao/InvalidSlotA.cpp
+++ b/TAO/tao/PI/InvalidSlotA.cpp
@@ -25,15 +25,15 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "InvalidSlotC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
+#include "InvalidSlotA.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/struct_typecode.cpp:87
@@ -49,7 +49,7 @@ static TAO::TypeCode::Struct<char const *,
     "InvalidSlot",
     _tao_fields_PortableInterceptor_InvalidSlot,
     0);
-  
+
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_InvalidSlot =
@@ -58,7 +58,7 @@ namespace PortableInterceptor
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 namespace TAO
@@ -70,12 +70,12 @@ namespace TAO
     )
   {
     CORBA::String_var id;
-    
+
     if (!(cdr >> id.out ()))
       {
         return false;
       }
-    
+
     ACE_TRY_NEW_ENV
       {
         this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
@@ -86,7 +86,7 @@ namespace TAO
         return false;
       }
     ACE_ENDTRY;
-    
+
     return true;
   }
 }
diff --git a/TAO/tao/VisibilityC.h b/TAO/tao/PI/InvalidSlotA.h
index 86b69215c9e..bd02e893965 100644
--- a/TAO/tao/VisibilityC.h
+++ b/TAO/tao/PI/InvalidSlotA.h
@@ -28,8 +28,8 @@
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:153
 
-#ifndef _TAO_IDL_ORIG_VISIBILITYC_H_
-#define _TAO_IDL_ORIG_VISIBILITYC_H_
+#ifndef _TAO_IDL_ORIG_INVALIDSLOTA_H_
+#define _TAO_IDL_ORIG_INVALIDSLOTA_H_
 
 #include /**/ "ace/pre.h"
 
@@ -40,14 +40,13 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
+#include "tao/PI/pi_export.h"
+#include "tao/PI/InvalidSlotC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
-#define TAO_EXPORT_MACRO TAO_Export
+#define TAO_EXPORT_MACRO TAO_PI_Export
 
 #if defined(_MSC_VER)
 #pragma warning(push)
@@ -61,34 +60,17 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
-namespace CORBA
+namespace PortableInterceptor
 {
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:379
-  
-  typedef CORBA::Short Visibility;
-  typedef CORBA::Short_out Visibility_out;
-  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_Visibility;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::Visibility PRIVATE_MEMBER = 0;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::Visibility PUBLIC_MEMBER = 1;
+
+  extern TAO_PI_Export ::CORBA::TypeCode_ptr const _tc_InvalidSlot;
 
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:66
 
-} // module CORBA
+} // module PortableInterceptor
 
 // TAO_IDL - Generated from
 // be\be_visitor_traits.cpp:61
@@ -99,6 +81,14 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_exception/any_op_ch.cpp:52
+
+TAO_PI_Export void operator<<= (CORBA::Any &, const PortableInterceptor::InvalidSlot &); // copying version
+TAO_PI_Export void operator<<= (CORBA::Any &, PortableInterceptor::InvalidSlot*); // noncopying version
+TAO_PI_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::InvalidSlot *&); // deprecated
+TAO_PI_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableInterceptor::InvalidSlot *&);
+
+// TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
 #if defined(_MSC_VER)
diff --git a/TAO/tao/InvalidSlotC.cpp b/TAO/tao/PI/InvalidSlotC.cpp
index ede7638814e..441c13306f4 100644
--- a/TAO/tao/InvalidSlotC.cpp
+++ b/TAO/tao/PI/InvalidSlotC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "InvalidSlotC.h"
+#include "InvalidSlotA.h"
 #include "tao/CDR.h"
 #include "tao/SystemException.h"
 #include "ace/OS_NS_string.h"
@@ -47,7 +47,7 @@ namespace TAO
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 PortableInterceptor::InvalidSlot::InvalidSlot (void)
@@ -129,7 +129,7 @@ void PortableInterceptor::InvalidSlot::_tao_encode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -142,7 +142,7 @@ void PortableInterceptor::InvalidSlot::_tao_decode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
diff --git a/TAO/tao/InvalidSlotC.h b/TAO/tao/PI/InvalidSlotC.h
index 03b060a0081..47acd600e79 100644
--- a/TAO/tao/InvalidSlotC.h
+++ b/TAO/tao/PI/InvalidSlotC.h
@@ -40,14 +40,14 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/TAO_Export.h"
+#include "tao/PI/pi_export.h"
 #include "tao/ORB.h"
 #include "tao/Environment.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
-#define TAO_EXPORT_MACRO TAO_Export
+#define TAO_EXPORT_MACRO TAO_PI_Export
 
 #if defined(_MSC_VER)
 #pragma warning(push)
@@ -63,30 +63,30 @@
 
 namespace PortableInterceptor
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_exception/exception_ch.cpp:53
 
 #if !defined (_PORTABLEINTERCEPTOR_INVALIDSLOT_CH_)
 #define _PORTABLEINTERCEPTOR_INVALIDSLOT_CH_
-  
-  class TAO_Export InvalidSlot : public CORBA::UserException
+
+  class TAO_PI_Export InvalidSlot : public CORBA::UserException
   {
   public:
-    
+
     InvalidSlot (void);
     InvalidSlot (const InvalidSlot &);
     ~InvalidSlot (void);
 
     InvalidSlot &operator= (const InvalidSlot &);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     static InvalidSlot *_downcast (CORBA::Exception *);
     static const InvalidSlot *_downcast (CORBA::Exception const *);
-    
+
     static CORBA::Exception *_alloc (void);
-    
+
     virtual CORBA::Exception *_tao_duplicate (void) const;
 
     virtual void _raise (void) const;
@@ -95,22 +95,17 @@ namespace PortableInterceptor
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL
       ) const;
-    
+
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:129
-    
+
     virtual CORBA::TypeCode_ptr _tao_type (void) const;
   };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_InvalidSlot;
 
 #endif /* end #if !defined */
 
@@ -128,18 +123,10 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// 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
 // 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_PI_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterceptor::InvalidSlot &);
+TAO_PI_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::InvalidSlot &);
 
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
diff --git a/TAO/tao/InvalidSlotS.h b/TAO/tao/PI/InvalidSlotS.h
index 17b1360599e..17b1360599e 100644
--- a/TAO/tao/InvalidSlotS.h
+++ b/TAO/tao/PI/InvalidSlotS.h
diff --git a/TAO/tao/PI/ORBInitInfo.cpp b/TAO/tao/PI/ORBInitInfo.cpp
index 36ad778a95a..658f11d6238 100644
--- a/TAO/tao/PI/ORBInitInfo.cpp
+++ b/TAO/tao/PI/ORBInitInfo.cpp
@@ -11,7 +11,7 @@
 #include "ace/Service_Config.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
-#include "tao/PICurrent.h"
+#include "PICurrent.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 ACE_RCSID (TAO,
diff --git a/TAO/tao/PI/ORBInitInfoA.cpp b/TAO/tao/PI/ORBInitInfoA.cpp
index 4a097c2a612..86c49b8a9e6 100644
--- a/TAO/tao/PI/ORBInitInfoA.cpp
+++ b/TAO/tao/PI/ORBInitInfoA.cpp
@@ -26,17 +26,17 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "ORBInitInfoC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/alias_typecode.cpp:50
@@ -49,7 +49,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/PortableInterceptor/ORBInitInfo/ObjectId:1.0",
     "ObjectId",
     &CORBA::_tc_string);
-  
+
 ::CORBA::TypeCode_ptr const PortableInterceptor::ORBInitInfo::_tc_ObjectId =
   &_tao_tc_PortableInterceptor_ORBInitInfo_ObjectId;
 
@@ -59,7 +59,7 @@ static TAO::TypeCode::Alias<char const *,
 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_PortableInterceptor_ORBInitInfo_DuplicateName[] =
   {
     { "name", &CORBA::_tc_string }
-    
+
   };
 static TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
@@ -71,7 +71,7 @@ static TAO::TypeCode::Struct<char const *,
     "DuplicateName",
     _tao_fields_PortableInterceptor_ORBInitInfo_DuplicateName,
     1);
-  
+
 ::CORBA::TypeCode_ptr const PortableInterceptor::ORBInitInfo::_tc_DuplicateName =
   &_tao_tc_PortableInterceptor_ORBInitInfo_DuplicateName;
 
@@ -89,7 +89,7 @@ static TAO::TypeCode::Struct<char const *,
     "InvalidName",
     _tao_fields_PortableInterceptor_ORBInitInfo_InvalidName,
     0);
-  
+
 ::CORBA::TypeCode_ptr const PortableInterceptor::ORBInitInfo::_tc_InvalidName =
   &_tao_tc_PortableInterceptor_ORBInitInfo_InvalidName;
 
@@ -102,7 +102,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/PortableInterceptor/ORBInitInfo:1.0",
     "ORBInitInfo");
-  
+
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_ORBInitInfo =
@@ -135,7 +135,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<PortableInterceptor::ORBInitInfo>::demarshal_value (TAO_InputCDR &)
@@ -186,7 +186,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 namespace TAO
@@ -197,7 +197,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::DuplicateName>::demarshal_value (TAO_InputCDR &)
@@ -261,7 +261,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 namespace TAO
@@ -272,7 +272,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::InvalidName>::demarshal_value (TAO_InputCDR &)
diff --git a/TAO/tao/PI/ORBInitializerA.cpp b/TAO/tao/PI/ORBInitializerA.cpp
index 6eef8945468..61bf2ec78aa 100644
--- a/TAO/tao/PI/ORBInitializerA.cpp
+++ b/TAO/tao/PI/ORBInitializerA.cpp
@@ -26,13 +26,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "ORBInitializerC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/objref_typecode.cpp:76
@@ -43,7 +43,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/PortableInterceptor/ORBInitializer:1.0",
     "ORBInitializer");
-  
+
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_ORBInitializer =
@@ -76,7 +76,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<PortableInterceptor::ORBInitializer>::demarshal_value (TAO_InputCDR &)
diff --git a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp
index 89986bc2a56..55efc3a28a9 100644
--- a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp
+++ b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp
@@ -1,7 +1,8 @@
 #include "ORBInitializer_Registry_Impl.h"
 #include "ORBInitInfo.h"
+#include "PICurrent.h"
 
-#include "tao/ORB.h"
+#include "tao/ORB_Core.h"
 #include "tao/ORB_Constants.h"
 #include "tao/SystemException.h"
 
@@ -123,7 +124,7 @@ TAO::ORBInitializer_Registry::post_init (
   TAO_ORB_Core *orb_core,
   int argc,
   char *argv[],
-  PortableInterceptor::SlotId &slotid
+  PortableInterceptor::SlotId slotid
   ACE_ENV_ARG_DECL)
 {
   if (pre_init_count > 0)
@@ -155,7 +156,20 @@ TAO::ORBInitializer_Registry::post_init (
           ACE_CHECK;
         }
 
-      slotid = orb_init_info_->slot_count ();
+#if TAO_HAS_INTERCEPTORS == 1
+      CORBA::Object_ptr picurrent_ptr = orb_core->pi_current ();
+
+      if (!CORBA::is_nil (picurrent_ptr))
+        {
+          TAO::PICurrent *pi = dynamic_cast <TAO::PICurrent*> (picurrent_ptr);
+
+          if (pi)
+            {
+              pi->initialize (orb_init_info_->slot_count () ACE_ENV_ARG_PARAMETER);
+              ACE_CHECK;
+            }
+        }
+#endif /* TAO_HAS_INTERCEPTORS == 1 */
 
       // Invalidate the ORBInitInfo instance to prevent future
       // modifications to the ORB.  This behavior complies with the
diff --git a/TAO/tao/PI/ORBInitializer_Registry_Impl.h b/TAO/tao/PI/ORBInitializer_Registry_Impl.h
index 2a3d83d114b..f8f8b9ab7ae 100644
--- a/TAO/tao/PI/ORBInitializer_Registry_Impl.h
+++ b/TAO/tao/PI/ORBInitializer_Registry_Impl.h
@@ -70,7 +70,7 @@ namespace TAO
         TAO_ORB_Core *orb_core,
         int argc,
         char *argv[],
-        PortableInterceptor::SlotId &slotid
+        PortableInterceptor::SlotId slotid
         ACE_ENV_ARG_DECL);
 
   private:
diff --git a/TAO/tao/PI/PI.h b/TAO/tao/PI/PI.h
index ab654f7a923..389c1ebdce3 100644
--- a/TAO/tao/PI/PI.h
+++ b/TAO/tao/PI/PI.h
@@ -46,6 +46,7 @@ TAO_Requires_PI_Initializer =
 #include "InterceptorC.h"
 #include "ClientRequestInfoC.h"
 #include "ClientRequestInterceptorC.h"
+#include "PICurrentC.h"
 #undef TAO_PI_SAFE_INCLUDE
 
 #endif  /* TAO_PI_H */
diff --git a/TAO/tao/PICurrent.cpp b/TAO/tao/PI/PICurrent.cpp
index 421b76bb74a..dc3bf53884a 100644
--- a/TAO/tao/PICurrent.cpp
+++ b/TAO/tao/PI/PICurrent.cpp
@@ -11,15 +11,17 @@ ACE_RCSID (tao,
 # include "PICurrent.inl"
 #endif /* __ACE_INLINE__ */
 
-#include "ORB_Core.h"
-#include "ORB_Core_TSS_Resources.h"
-#include "TAO_Server_Request.h"
-#include "PICurrent_Copy_Callback.h"
-#include "SystemException.h"
+#include "PICurrent_Impl.h"
+
+#include "tao/ORB_Core.h"
+#include "tao/ORB_Core_TSS_Resources.h"
+#include "tao/TAO_Server_Request.h"
+#include "tao/SystemException.h"
 
 
 TAO::PICurrent::PICurrent (TAO_ORB_Core &orb_core)
   : orb_core_ (orb_core),
+    tss_slot_ (0),
     slot_count_ (0)
 {
 }
@@ -70,10 +72,11 @@ TAO::PICurrent::set_slot (PortableInterceptor::SlotId identifier,
 TAO::PICurrent_Impl *
 TAO::PICurrent::tsc (void)
 {
-  TAO_ORB_Core_TSS_Resources *tss =
-    this->orb_core_.get_tss_resources ();
+  TAO::PICurrent_Impl *impl =
+    static_cast<TAO::PICurrent_Impl *> (
+      this->orb_core_.get_tss_resource (this->tss_slot_));
 
-  return &tss->pi_current_;
+  return impl;
 }
 
 void
@@ -92,4 +95,30 @@ TAO::PICurrent::_get_orb (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   return CORBA::ORB::_duplicate (this->orb_core_.orb ());
 }
 
+int
+TAO::PICurrent::initialize (PortableInterceptor::SlotId sc
+                            ACE_ENV_ARG_DECL_NOT_USED)
+{
+  this->slot_count_ = sc;
+
+  if (this->tsc () == 0 && tss_slot_ == 0)
+    {
+      TAO::PICurrent_Impl *impl = 0;
+      ACE_NEW_RETURN (impl,
+                      TAO::PICurrent_Impl,
+                      0);
+
+      const int result = this->orb_core_.add_tss_cleanup_func (0,
+                                                               tss_slot_);
+
+      if (result != 0)
+        return result;
+
+      this->orb_core_.set_tss_resource (tss_slot_, impl);
+    }
+
+  return 0;
+}
+
+
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tao/PICurrent.h b/TAO/tao/PI/PICurrent.h
index 107d16c8d77..98e391d1aaf 100644
--- a/TAO/tao/PICurrent.h
+++ b/TAO/tao/PI/PICurrent.h
@@ -15,25 +15,24 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/TAO_Export.h"
+#include "pi_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbconf.h"
+#include "tao/orbconf.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-#include "ace/Array_Base.h"
-#include "Any.h"
 #include "PICurrentC.h"
-#include "LocalObject.h"
+
+#include "ace/Array_Base.h"
+#include "tao/LocalObject.h"
 
 #if defined(_MSC_VER)
 # pragma warning(push)
 # pragma warning(disable:4250)
-# pragma warning(disable:4251)
 #endif /* _MSC_VER */
 
 /// Forward declarations.
@@ -54,7 +53,7 @@ namespace TAO
    * request interceptors, in addition to passing data from an
    * interceptor to the calling thread.
    */
-  class TAO_Export PICurrent
+  class TAO_PI_Export PICurrent
     : public virtual PortableInterceptor::Current,
       public virtual TAO_Local_RefCounted_Object
   {
@@ -101,7 +100,7 @@ namespace TAO
                          ACE_ENV_ARG_DECL);
 
     /// Initialize the PICurrent object.
-    void initialize (PortableInterceptor::SlotId sc);
+    int initialize (PortableInterceptor::SlotId sc ACE_ENV_ARG_DECL);
 
   protected:
 
@@ -126,6 +125,9 @@ namespace TAO
     /// Reference to the orb core.
     TAO_ORB_Core &orb_core_;
 
+    /// TSS slot assigned to this object.
+    size_t tss_slot_;
+
     /// The number of allocated slots.
     PortableInterceptor::SlotId slot_count_;
 
diff --git a/TAO/tao/PICurrent.inl b/TAO/tao/PI/PICurrent.inl
index 5f64a548660..7fd7fc77b1b 100644
--- a/TAO/tao/PICurrent.inl
+++ b/TAO/tao/PI/PICurrent.inl
@@ -9,9 +9,3 @@ TAO::PICurrent::slot_count (void) const
   return this->slot_count_;
 }
 
-ACE_INLINE void
-TAO::PICurrent::initialize (PortableInterceptor::SlotId sc)
-{
-  this->slot_count_ = sc;
-}
-
diff --git a/TAO/tao/PICurrent.pidl b/TAO/tao/PI/PICurrent.pidl
index f60324effc1..f60324effc1 100644
--- a/TAO/tao/PICurrent.pidl
+++ b/TAO/tao/PI/PICurrent.pidl
diff --git a/TAO/tao/PICurrentA.cpp b/TAO/tao/PI/PICurrentA.cpp
index 6a256f1cdf8..3b0f9ba8765 100644
--- a/TAO/tao/PICurrentA.cpp
+++ b/TAO/tao/PI/PICurrentA.cpp
@@ -25,15 +25,15 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "PICurrentC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
+#include "PICurrentA.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/objref_typecode.cpp:76
@@ -44,7 +44,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/PortableInterceptor/Current:1.0",
     "Current");
-  
+
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_Current =
@@ -77,7 +77,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<PortableInterceptor::Current>::demarshal_value (TAO_InputCDR &)
diff --git a/TAO/tao/ValueModifierC.h b/TAO/tao/PI/PICurrentA.h
index 2bfe5a25b4e..092901e4ad4 100644
--- a/TAO/tao/ValueModifierC.h
+++ b/TAO/tao/PI/PICurrentA.h
@@ -28,8 +28,8 @@
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:153
 
-#ifndef _TAO_IDL_ORIG_VALUEMODIFIERC_H_
-#define _TAO_IDL_ORIG_VALUEMODIFIERC_H_
+#ifndef _TAO_IDL_ORIG_PICURRENTA_H_
+#define _TAO_IDL_ORIG_PICURRENTA_H_
 
 #include /**/ "ace/pre.h"
 
@@ -40,14 +40,13 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
+#include "pi_export.h"
+#include "tao/PI/PICurrentC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
-#define TAO_EXPORT_MACRO TAO_Export
+#define TAO_EXPORT_MACRO TAO_PI_Export
 
 #if defined(_MSC_VER)
 #pragma warning(push)
@@ -61,47 +60,24 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
-namespace CORBA
+namespace PortableInterceptor
 {
-  
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:379
-  
-  typedef CORBA::Short ValueModifier;
-  typedef CORBA::Short_out ValueModifier_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::ValueModifier VM_NONE = 0;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::ValueModifier VM_CUSTOM = 1;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::ValueModifier VM_ABSTRACT = 2;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::ValueModifier VM_TRUNCATABLE = 3;
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+
+  extern TAO_PI_Export ::CORBA::TypeCode_ptr const _tc_Current;
 
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:66
 
-} // module CORBA
+} // module PortableInterceptor
 
 // TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
+// be\be_visitor_interface/any_op_ch.cpp:52
 
-// Traits specializations.
-namespace TAO
-{
-}
+TAO_PI_Export void operator<<= (CORBA::Any &, PortableInterceptor::Current_ptr); // copying
+TAO_PI_Export void operator<<= (CORBA::Any &, PortableInterceptor::Current_ptr *); // non-copying
+TAO_PI_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::Current_ptr &);
 
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
diff --git a/TAO/tao/PICurrentC.cpp b/TAO/tao/PI/PICurrentC.cpp
index 197b87f3c07..197b87f3c07 100644
--- a/TAO/tao/PICurrentC.cpp
+++ b/TAO/tao/PI/PICurrentC.cpp
diff --git a/TAO/tao/PICurrentC.h b/TAO/tao/PI/PICurrentC.h
index e54d5082d55..242cd2d0ca5 100644
--- a/TAO/tao/PICurrentC.h
+++ b/TAO/tao/PI/PICurrentC.h
@@ -40,24 +40,21 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/TAO_Export.h"
+#include "pi_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Any.h"
-#include "tao/TypeCode.h"
 #include "tao/Objref_VarOut_T.h"
 
-#include "tao/InvalidSlotC.h"
+#include "tao/PI/InvalidSlotC.h"
 #include "tao/PI_ForwardC.h"
 #include "tao/CurrentC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
-#define TAO_EXPORT_MACRO TAO_Export
+#define TAO_EXPORT_MACRO TAO_PI_Export
 
 #if defined(_MSC_VER)
 #pragma warning(push)
@@ -73,22 +70,22 @@
 
 namespace PortableInterceptor
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_CURRENT__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_CURRENT__VAR_OUT_CH_
-  
+
   class Current;
   typedef Current *Current_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         Current
       >
     Current_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         Current
@@ -96,45 +93,45 @@ namespace PortableInterceptor
     Current_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLEINTERCEPTOR_CURRENT_CH_)
 #define _PORTABLEINTERCEPTOR_CURRENT_CH_
-  
-  class TAO_Export Current
+
+  class TAO_PI_Export Current
     : public virtual ::CORBA::Current
   {
   public:
     typedef Current_ptr _ptr_type;
     typedef Current_var _var_type;
-    
+
     // The static operations.
     static Current_ptr _duplicate (Current_ptr obj);
-    
+
     static void _tao_release (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 static_cast<Current_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Any * get_slot (
         ::PortableInterceptor::SlotId id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -143,10 +140,10 @@ namespace PortableInterceptor
         CORBA::SystemException,
         ::PortableInterceptor::InvalidSlot
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void set_slot (
         ::PortableInterceptor::SlotId id,
         const ::CORBA::Any & data
@@ -156,37 +153,32 @@ namespace PortableInterceptor
         CORBA::SystemException,
         ::PortableInterceptor::InvalidSlot
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     Current (void);
-    
+
     virtual ~Current (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     Current (const Current &);
-    
+
     void operator= (const Current &);
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_Current;
 
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:66
@@ -202,9 +194,9 @@ namespace TAO
 
 #if !defined (_PORTABLEINTERCEPTOR_CURRENT__TRAITS_CH_)
 #define _PORTABLEINTERCEPTOR_CURRENT__TRAITS_CH_
-  
+
   template<>
-  struct TAO_Export Objref_Traits< ::PortableInterceptor::Current>
+  struct TAO_PI_Export Objref_Traits< ::PortableInterceptor::Current>
   {
     static ::PortableInterceptor::Current_ptr duplicate (
         ::PortableInterceptor::Current_ptr
@@ -223,13 +215,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// 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
 // be\be_codegen.cpp:955
 
 #if defined(_MSC_VER)
diff --git a/TAO/tao/PICurrentS.h b/TAO/tao/PI/PICurrentS.h
index 17b1360599e..17b1360599e 100644
--- a/TAO/tao/PICurrentS.h
+++ b/TAO/tao/PI/PICurrentS.h
diff --git a/TAO/tao/PICurrent_Copy_Callback.cpp b/TAO/tao/PI/PICurrent_Copy_Callback.cpp
index bb4b79aa4e5..7ad09ada95b 100644
--- a/TAO/tao/PICurrent_Copy_Callback.cpp
+++ b/TAO/tao/PI/PICurrent_Copy_Callback.cpp
@@ -25,7 +25,7 @@ TAO::PICurrent_Copy_Callback::~PICurrent_Copy_Callback (void)
 }
 
 int
-TAO::PICurrent_Copy_Callback::execute (void *)
+TAO::PICurrent_Copy_Callback::execute (void)
 {
   if (this->src_ != 0 && this->dst_ != 0
       && this->src_ != this->dst_)
diff --git a/TAO/tao/PICurrent_Copy_Callback.h b/TAO/tao/PI/PICurrent_Copy_Callback.h
index 09e5b384c76..5b5f17d4505 100644
--- a/TAO/tao/PICurrent_Copy_Callback.h
+++ b/TAO/tao/PI/PICurrent_Copy_Callback.h
@@ -15,18 +15,16 @@
 
 #include /**/ "ace/pre.h"
 
-#include "TAO_Export.h"
+#include "pi_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbconf.h"
+#include "tao/orbconf.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-#include "ace/Functor.h"
-
 namespace TAO
 {
   class PICurrent_Impl;
@@ -40,8 +38,7 @@ namespace TAO
    * object's slot table to the destination PICurrent_Impl object's
    * slot table.
    */
-  class TAO_Export PICurrent_Copy_Callback
-    : public ACE_Command_Base
+  class TAO_PI_Export PICurrent_Copy_Callback
   {
   public:
 
@@ -52,7 +49,7 @@ namespace TAO
     ~PICurrent_Copy_Callback (void);
 
     /// Perform the copy.
-    virtual int execute (void * arg = 0);
+    int execute (void);
 
     /// Set the source and destination PICurrent_Impl objects.
     void src_and_dst (PICurrent_Impl * src, PICurrent_Impl * dst);
diff --git a/TAO/tao/PICurrent_Impl.cpp b/TAO/tao/PI/PICurrent_Impl.cpp
index a201c29ffe8..ecbccc90274 100644
--- a/TAO/tao/PICurrent_Impl.cpp
+++ b/TAO/tao/PI/PICurrent_Impl.cpp
@@ -11,9 +11,10 @@ ACE_RCSID (tao,
 # include "PICurrent_Impl.inl"
 #endif /* __ACE_INLINE__ */
 
-#include "TAO_Server_Request.h"
 #include "PICurrent_Copy_Callback.h"
-#include "SystemException.h"
+
+#include "tao/TAO_Server_Request.h"
+#include "tao/SystemException.h"
 #include "ace/Log_Msg.h"
 
 TAO::PICurrent_Impl::PICurrent_Impl (void)
diff --git a/TAO/tao/PICurrent_Impl.h b/TAO/tao/PI/PICurrent_Impl.h
index 1f3e6d2a6b7..e77945a9135 100644
--- a/TAO/tao/PICurrent_Impl.h
+++ b/TAO/tao/PI/PICurrent_Impl.h
@@ -15,18 +15,18 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/TAO_Export.h"
+#include "pi_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbconf.h"
+#include "tao/orbconf.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 
 #include "ace/Array_Base.h"
-#include "Any.h"
+#include "tao/AnyTypeCode/Any.h"
 #include "PICurrentC.h"
 
 /// Forward declarations.
@@ -47,7 +47,7 @@ namespace TAO
    * "thread scope current" objects as required by Portable
    * Interceptors.
    */
-  class TAO_Export PICurrent_Impl
+  class TAO_PI_Export PICurrent_Impl
   {
   public:
 
diff --git a/TAO/tao/PICurrent_Impl.inl b/TAO/tao/PI/PICurrent_Impl.inl
index 8b708ec7f5a..8b708ec7f5a 100644
--- a/TAO/tao/PICurrent_Impl.inl
+++ b/TAO/tao/PI/PICurrent_Impl.inl
diff --git a/TAO/tao/PICurrent_Loader.cpp b/TAO/tao/PI/PICurrent_Loader.cpp
index 12ce0be04bc..5671986bb86 100644
--- a/TAO/tao/PICurrent_Loader.cpp
+++ b/TAO/tao/PI/PICurrent_Loader.cpp
@@ -54,6 +54,6 @@ ACE_STATIC_SVC_DEFINE (TAO_PICurrent_Loader,
                        &ACE_SVC_NAME (TAO_PICurrent_Loader),
                        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
                        0)
-ACE_FACTORY_DEFINE (TAO, TAO_PICurrent_Loader)
+ACE_FACTORY_DEFINE (TAO_PI, TAO_PICurrent_Loader)
 
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tao/PICurrent_Loader.h b/TAO/tao/PI/PICurrent_Loader.h
index 6235c9b06ec..0498d95dd5d 100644
--- a/TAO/tao/PICurrent_Loader.h
+++ b/TAO/tao/PI/PICurrent_Loader.h
@@ -17,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/TAO_Export.h"
+#include "pi_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -31,7 +31,7 @@
 
 #include "ace/Service_Config.h"
 
-class TAO_Export TAO_PICurrent_Loader
+class TAO_PI_Export TAO_PICurrent_Loader
   : public TAO_Object_Loader
 {
 public:
@@ -47,7 +47,7 @@ public:
 };
 
 ACE_STATIC_SVC_DECLARE (TAO_PICurrent_Loader)
-ACE_FACTORY_DECLARE (TAO, TAO_PICurrent_Loader)
+ACE_FACTORY_DECLARE (TAO_PI, TAO_PICurrent_Loader)
 
 static int
 TAO_Requires_PICurrent_Initializer = TAO_PICurrent_Loader::Initializer ();
diff --git a/TAO/tao/PI/PIForwardRequestA.cpp b/TAO/tao/PI/PIForwardRequestA.cpp
index bd8c5684d25..c0e4bd3cb89 100644
--- a/TAO/tao/PI/PIForwardRequestA.cpp
+++ b/TAO/tao/PI/PIForwardRequestA.cpp
@@ -26,14 +26,14 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "PIForwardRequestC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/struct_typecode.cpp:87
@@ -41,7 +41,7 @@
 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_PortableInterceptor_ForwardRequest[] =
   {
     { "forward", &CORBA::_tc_Object }
-    
+
   };
 static TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
@@ -53,7 +53,7 @@ static TAO::TypeCode::Struct<char const *,
     "ForwardRequest",
     _tao_fields_PortableInterceptor_ForwardRequest,
     1);
-  
+
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_ForwardRequest =
@@ -62,7 +62,7 @@ namespace PortableInterceptor
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 namespace TAO
@@ -74,12 +74,12 @@ namespace TAO
     )
   {
     CORBA::String_var id;
-    
+
     if (!(cdr >> id.out ()))
       {
         return false;
       }
-    
+
     ACE_TRY_NEW_ENV
       {
         this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
@@ -90,7 +90,7 @@ namespace TAO
         return false;
       }
     ACE_ENDTRY;
-    
+
     return true;
   }
 }
diff --git a/TAO/tao/PI/PolicyFactoryA.cpp b/TAO/tao/PI/PolicyFactoryA.cpp
index d0ecbffbf57..eba4bd3ab6a 100644
--- a/TAO/tao/PI/PolicyFactoryA.cpp
+++ b/TAO/tao/PI/PolicyFactoryA.cpp
@@ -26,13 +26,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "PolicyFactoryC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/objref_typecode.cpp:76
@@ -43,7 +43,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/PortableInterceptor/PolicyFactory:1.0",
     "PolicyFactory");
-  
+
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_PolicyFactory =
@@ -76,7 +76,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<PortableInterceptor::PolicyFactory>::demarshal_value (TAO_InputCDR &)
diff --git a/TAO/tao/PI/PolicyFactoryC.h b/TAO/tao/PI/PolicyFactoryC.h
index e4e9410ec0e..ff691089edc 100644
--- a/TAO/tao/PI/PolicyFactoryC.h
+++ b/TAO/tao/PI/PolicyFactoryC.h
@@ -45,9 +45,9 @@
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Any.h"
-#include "tao/TypeCode.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/Objref_VarOut_T.h"
 
 #include "tao/PolicyC.h"
@@ -71,22 +71,22 @@
 
 namespace PortableInterceptor
 {
-  
+
   // TAO_IDL - Generated from
   // .\be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_POLICYFACTORY__VAR_OUT_CH_
-  
+
   class PolicyFactory;
   typedef PolicyFactory *PolicyFactory_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         PolicyFactory
       >
     PolicyFactory_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         PolicyFactory
@@ -94,45 +94,45 @@ namespace PortableInterceptor
     PolicyFactory_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY_CH_)
 #define _PORTABLEINTERCEPTOR_POLICYFACTORY_CH_
-  
+
   class TAO_PI_Export PolicyFactory
     : public virtual CORBA::Object
   {
   public:
     typedef PolicyFactory_ptr _ptr_type;
     typedef PolicyFactory_var _var_type;
-    
+
     // The static operations.
     static PolicyFactory_ptr _duplicate (PolicyFactory_ptr obj);
-    
+
     static void _tao_release (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 static_cast<PolicyFactory_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // c:\ace\latest\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
@@ -142,7 +142,7 @@ namespace PortableInterceptor
         CORBA::SystemException,
         ::CORBA::PolicyError
       )) = 0;
-    
+
     // Hand-crafted addition.
     virtual ::CORBA::Policy_ptr _create_policy (
         CORBA::PolicyType type
@@ -155,33 +155,33 @@ namespace PortableInterceptor
 
     // TAO_IDL - Generated from
     // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     PolicyFactory (void);
-    
+
     virtual ~PolicyFactory (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     PolicyFactory (const PolicyFactory &);
-    
+
     void operator= (const PolicyFactory &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   extern TAO_PI_Export ::CORBA::TypeCode_ptr const _tc_PolicyFactory;
 
 // TAO_IDL - Generated from
@@ -198,7 +198,7 @@ namespace TAO
 
 #if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY__TRAITS_CH_)
 #define _PORTABLEINTERCEPTOR_POLICYFACTORY__TRAITS_CH_
-  
+
   template<>
   struct TAO_PI_Export Objref_Traits< ::PortableInterceptor::PolicyFactory>
   {
diff --git a/TAO/tao/PI/RequestInfo.pidl b/TAO/tao/PI/RequestInfo.pidl
index 5714a704de4..e832e45d2ca 100644
--- a/TAO/tao/PI/RequestInfo.pidl
+++ b/TAO/tao/PI/RequestInfo.pidl
@@ -23,9 +23,9 @@
 #define _REQUESTINFO_PIDL_
 
 #include <PI_Forward.pidl>
-#include <Dynamic.pidl>
+#include "tao/AnyTypeCode/Dynamic.pidl"
 #include <Messaging_SyncScope.pidl>
-#include <InvalidSlot.pidl>
+#include "tao/PI/InvalidSlot.pidl"
 #include <IOP_IOR.pidl>
 
 module PortableInterceptor {
diff --git a/TAO/tao/PI/RequestInfoA.cpp b/TAO/tao/PI/RequestInfoA.cpp
index b01b21aca7f..79d1beb30cc 100644
--- a/TAO/tao/PI/RequestInfoA.cpp
+++ b/TAO/tao/PI/RequestInfoA.cpp
@@ -26,14 +26,14 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "RequestInfoC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/objref_typecode.cpp:76
@@ -44,7 +44,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/PortableInterceptor/RequestInfo:1.0",
     "RequestInfo");
-  
+
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_RequestInfo =
@@ -77,7 +77,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<PortableInterceptor::RequestInfo>::demarshal_value (TAO_InputCDR &)
diff --git a/TAO/tao/PI/RequestInfoC.h b/TAO/tao/PI/RequestInfoC.h
index 90fde2c2eb6..7c9d6ddb4fb 100644
--- a/TAO/tao/PI/RequestInfoC.h
+++ b/TAO/tao/PI/RequestInfoC.h
@@ -45,15 +45,15 @@
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Any.h"
-#include "tao/TypeCode.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/Objref_VarOut_T.h"
 
 #include "tao/PI_ForwardC.h"
-#include "tao/DynamicC.h"
+#include "tao/AnyTypeCode/DynamicC.h"
 #include "tao/Messaging_SyncScopeC.h"
-#include "tao/InvalidSlotC.h"
+#include "tao/PI/InvalidSlotC.h"
 #include "tao/IOP_IORC.h"
 
 #if defined (TAO_EXPORT_MACRO)
@@ -75,22 +75,22 @@
 
 namespace PortableInterceptor
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_REQUESTINFO__VAR_OUT_CH_
-  
+
   class RequestInfo;
   typedef RequestInfo *RequestInfo_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         RequestInfo
       >
     RequestInfo_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         RequestInfo
@@ -98,155 +98,155 @@ namespace PortableInterceptor
     RequestInfo_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO_CH_)
 #define _PORTABLEINTERCEPTOR_REQUESTINFO_CH_
-  
+
   class TAO_PI_Export RequestInfo
     : public virtual CORBA::Object
   {
   public:
     typedef RequestInfo_ptr _ptr_type;
     typedef RequestInfo_var _var_type;
-    
+
     // The static operations.
     static RequestInfo_ptr _duplicate (RequestInfo_ptr obj);
-    
+
     static void _tao_release (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 static_cast<RequestInfo_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // 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
     // 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
     // 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
     // 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
     // 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
     // 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
     // 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
     // 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;
-    
+
     // TAO_IDL - Generated from
     // 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;
-    
+
     // TAO_IDL - Generated from
     // 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
     // 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
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Any * get_slot (
         ::PortableInterceptor::SlotId id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -255,10 +255,10 @@ namespace PortableInterceptor
         CORBA::SystemException,
         ::PortableInterceptor::InvalidSlot
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::IOP::ServiceContext * get_request_service_context (
         ::IOP::ServiceId id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -266,10 +266,10 @@ namespace PortableInterceptor
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::IOP::ServiceContext * get_reply_service_context (
         ::IOP::ServiceId id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -277,36 +277,36 @@ namespace PortableInterceptor
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     RequestInfo (void);
-    
+
     virtual ~RequestInfo (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     RequestInfo (const RequestInfo &);
-    
+
     void operator= (const RequestInfo &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   extern TAO_PI_Export ::CORBA::TypeCode_ptr const _tc_RequestInfo;
 
 // TAO_IDL - Generated from
@@ -323,7 +323,7 @@ namespace TAO
 
 #if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO__TRAITS_CH_)
 #define _PORTABLEINTERCEPTOR_REQUESTINFO__TRAITS_CH_
-  
+
   template<>
   struct TAO_PI_Export Objref_Traits< ::PortableInterceptor::RequestInfo>
   {
diff --git a/TAO/tao/RequestInfo_Util.cpp b/TAO/tao/PI/RequestInfo_Util.cpp
index f4ba3e2fedc..191a30e51c4 100644
--- a/TAO/tao/RequestInfo_Util.cpp
+++ b/TAO/tao/PI/RequestInfo_Util.cpp
@@ -3,12 +3,14 @@
 // $Id$
 
 #include "RequestInfo_Util.h"
-#include "TypeCode.h"
-#include "ORB_Constants.h"
-#include "StringSeqC.h"
-#include "DynamicC.h"
-#include "SystemException.h"
 
+#if TAO_HAS_INTERCEPTORS == 1
+
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/AnyTypeCode/DynamicC.h"
+#include "tao/ORB_Constants.h"
+#include "tao/StringSeqC.h"
+#include "tao/SystemException.h"
 
 ACE_RCSID (tao,
            RequestInfo_Util,
@@ -105,3 +107,5 @@ TAO_RequestInfo_Util::make_any (CORBA::Boolean tk_void_any
 
   return any;
 }
+
+#endif
diff --git a/TAO/tao/RequestInfo_Util.h b/TAO/tao/PI/RequestInfo_Util.h
index bdf4278ed34..f32b1d8dc2f 100644
--- a/TAO/tao/RequestInfo_Util.h
+++ b/TAO/tao/PI/RequestInfo_Util.h
@@ -14,14 +14,19 @@
 #define TAO_REQUEST_INFO_UTIL_H
 
 #include /**/ "ace/pre.h"
-#include "ace/CORBA_macros.h"
+
+#include "tao/Basic_Types.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Basic_Types.h"
-#include "tao/TAO_Export.h"
+#include "tao/orbconf.h"
+
+#if TAO_HAS_INTERCEPTORS == 1
+
+#include "ace/CORBA_macros.h"
+#include "pi_export.h"
 
 namespace CORBA
 {
@@ -45,7 +50,7 @@ namespace Dynamic
  * PortableInterceptor::ClientRequestInfo and
  * PortableInterceptor::ServerRequestInfo objects.
  */
-class TAO_Export TAO_RequestInfo_Util
+class TAO_PI_Export TAO_RequestInfo_Util
 {
 public:
 
@@ -75,6 +80,8 @@ public:
   //@}
 };
 
+#endif
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_REQUEST_INFO_UTIL_H */
diff --git a/TAO/tao/PI_ForwardC.cpp b/TAO/tao/PI_ForwardC.cpp
index 2887387a168..a077461b82b 100644
--- a/TAO/tao/PI_ForwardC.cpp
+++ b/TAO/tao/PI_ForwardC.cpp
@@ -32,10 +32,6 @@
 #include "PI_ForwardC.h"
 #include "tao/CDR.h"
 #include "tao/ORB_Core.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -49,163 +45,3 @@ namespace TAO
 {
 }
 
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_PortableInterceptor_ServerId (
-    CORBA::tk_alias,
-    "IDL:omg.org/PortableInterceptor/ServerId:1.0",
-    "ServerId",
-    &CORBA::_tc_string);
-  
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr const _tc_ServerId =
-    &_tao_tc_PortableInterceptor_ServerId;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_PortableInterceptor_ORBId (
-    CORBA::tk_alias,
-    "IDL:omg.org/PortableInterceptor/ORBId:1.0",
-    "ORBId",
-    &CORBA::_tc_string);
-  
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr const _tc_ORBId =
-    &_tao_tc_PortableInterceptor_ORBId;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_PortableInterceptor_AdapterName (
-    CORBA::tk_alias,
-    "IDL:omg.org/PortableInterceptor/AdapterName:1.0",
-    "AdapterName",
-    &CORBA::_tc_StringSeq);
-  
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr const _tc_AdapterName =
-    &_tao_tc_PortableInterceptor_AdapterName;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_PortableInterceptor_ObjectId (
-    CORBA::tk_alias,
-    "IDL:omg.org/PortableInterceptor/ObjectId:1.0",
-    "ObjectId",
-    &CORBA::_tc_OctetSeq);
-  
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr const _tc_ObjectId =
-    &_tao_tc_PortableInterceptor_ObjectId;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_PortableInterceptor_AdapterManagerId (
-    CORBA::tk_alias,
-    "IDL:omg.org/PortableInterceptor/AdapterManagerId:1.0",
-    "AdapterManagerId",
-    &CORBA::_tc_long);
-  
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr const _tc_AdapterManagerId =
-    &_tao_tc_PortableInterceptor_AdapterManagerId;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_PortableInterceptor_AdapterState (
-    CORBA::tk_alias,
-    "IDL:omg.org/PortableInterceptor/AdapterState:1.0",
-    "AdapterState",
-    &CORBA::_tc_short);
-  
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr const _tc_AdapterState =
-    &_tao_tc_PortableInterceptor_AdapterState;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_PortableInterceptor_SlotId (
-    CORBA::tk_alias,
-    "IDL:omg.org/PortableInterceptor/SlotId:1.0",
-    "SlotId",
-    &CORBA::_tc_ulong);
-  
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr const _tc_SlotId =
-    &_tao_tc_PortableInterceptor_SlotId;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_PortableInterceptor_ReplyStatus (
-    CORBA::tk_alias,
-    "IDL:omg.org/PortableInterceptor/ReplyStatus:1.0",
-    "ReplyStatus",
-    &CORBA::_tc_short);
-  
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr const _tc_ReplyStatus =
-    &_tao_tc_PortableInterceptor_ReplyStatus;
-}
-
-
diff --git a/TAO/tao/PI_ForwardC.h b/TAO/tao/PI_ForwardC.h
index 88c027c4e17..9738014449c 100644
--- a/TAO/tao/PI_ForwardC.h
+++ b/TAO/tao/PI_ForwardC.h
@@ -66,98 +66,58 @@
 
 namespace PortableInterceptor
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:413
-  
+
   typedef char * ServerId;
   typedef CORBA::String_var ServerId_var;
   typedef CORBA::String_out ServerId_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ServerId;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:413
-  
+
   typedef char * ORBId;
   typedef CORBA::String_var ORBId_var;
   typedef CORBA::String_out ORBId_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ORBId;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:472
-  
+
   typedef CORBA::StringSeq AdapterName;
   typedef CORBA::StringSeq_var AdapterName_var;
   typedef CORBA::StringSeq_out AdapterName_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_AdapterName;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:472
-  
+
   typedef CORBA::OctetSeq ObjectId;
   typedef CORBA::OctetSeq_var ObjectId_var;
   typedef CORBA::OctetSeq_out ObjectId_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ObjectId;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:379
-  
+
   typedef CORBA::Long AdapterManagerId;
   typedef CORBA::Long_out AdapterManagerId_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_AdapterManagerId;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:379
-  
+
   typedef CORBA::Short AdapterState;
   typedef CORBA::Short_out AdapterState_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_AdapterState;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:379
-  
+
   typedef CORBA::ULong SlotId;
   typedef CORBA::ULong_out SlotId_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_SlotId;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:379
-  
+
   typedef CORBA::Short ReplyStatus;
   typedef CORBA::Short_out ReplyStatus_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ReplyStatus;
 
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:66
diff --git a/TAO/tao/PI_Server.mpc b/TAO/tao/PI_Server.mpc
index d57c1f89108..11aea476aeb 100644
--- a/TAO/tao/PI_Server.mpc
+++ b/TAO/tao/PI_Server.mpc
@@ -27,6 +27,9 @@ project : taolib, pi, portableserver, core {
     PI_Server
   }
 
+  IDL_Files {
+  }
+
   Pkgconfig_Files {
     PI_Server/TAO_PI_Server.pc.in
   }
diff --git a/TAO/tao/PortableServer/PICurrent_Guard.cpp b/TAO/tao/PI_Server/PICurrent_Guard.cpp
index b396f7d9e00..9aff070ca96 100644
--- a/TAO/tao/PortableServer/PICurrent_Guard.cpp
+++ b/TAO/tao/PI_Server/PICurrent_Guard.cpp
@@ -10,8 +10,9 @@ ACE_RCSID (PortableServer,
 
 #include "tao/ORB_Core.h"
 #include "tao/TAO_Server_Request.h"
-#include "tao/PICurrent_Copy_Callback.h"
-
+#include "tao/PI/PICurrent_Copy_Callback.h"
+#include "tao/PI/PICurrent.h"
+#include "tao/PI/PICurrent_Impl.h"
 
 TAO::PICurrent_Guard::PICurrent_Guard (TAO_ServerRequest &server_request,
                                        bool tsc_to_rsc)
@@ -23,14 +24,18 @@ TAO::PICurrent_Guard::PICurrent_Guard (TAO_ServerRequest &server_request,
   // This constructor is used on the server side.
 
   // Retrieve the thread scope current (no TSS access incurred yet).
-  PICurrent * pi_current = server_request.orb_core ()->pi_current ();
+  CORBA::Object_ptr pi_current_obj =
+    server_request.orb_core ()->pi_current ();
+
+  TAO::PICurrent *pi_current =
+    dynamic_cast <TAO::PICurrent*> (pi_current_obj);
 
   // If the slot count is zero, there is nothing to copy.  Prevent any
   // copying (and hence TSS accesses) from occurring.
   if (pi_current != 0 && pi_current->slot_count () != 0)
     {
       // Retrieve the request scope current.
-      PICurrent_Impl * rsc = &server_request.rs_pi_current ();
+      PICurrent_Impl * rsc = server_request.rs_pi_current ();
 
       // Retrieve the thread scope current.
       PICurrent_Impl * tsc = pi_current->tsc ();
@@ -71,8 +76,8 @@ TAO::PICurrent_Guard::~PICurrent_Guard (void)
       // necessary, if the thread scope current is modified after its
       // contents have been *logically* copied to the request scope
       // current.  The same goes for the reverse, i.e. RSC to TSC.
-      this->copy_callback_.src_and_dst (this->src_, this->dest_);
-      this->src_->copy_callback (&this->copy_callback_);
+      this->copy_callback_->src_and_dst (this->src_, this->dest_);
+      this->src_->copy_callback (this->copy_callback_);
     }
 }
 
diff --git a/TAO/tao/PortableServer/PICurrent_Guard.h b/TAO/tao/PI_Server/PICurrent_Guard.h
index c4340fdbbf1..6bbda8f3ec4 100644
--- a/TAO/tao/PortableServer/PICurrent_Guard.h
+++ b/TAO/tao/PI_Server/PICurrent_Guard.h
@@ -15,7 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "pi_server_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -46,7 +46,7 @@ namespace TAO
    *
    * @note This Guard class is only used on the server side.
    */
-  class TAO_PortableServer_Export PICurrent_Guard
+  class TAO_PI_Server_Export PICurrent_Guard
   {
   public:
 
@@ -78,15 +78,15 @@ namespace TAO
   private:
 
     /// The PICurrent implementation whose slot table will be copied.
-    PICurrent_Impl * src_;
+    PICurrent_Impl *src_;
 
     /// The PICurrent implementation whose slot table will be filled
     /// with the contents of another PICurrent's slot table.
-    PICurrent_Impl * dest_;
+    PICurrent_Impl *dest_;
 
     /// Callback object responsible for performing deep copies of a
     /// PICurrent's slot table.
-    PICurrent_Copy_Callback & copy_callback_;
+    PICurrent_Copy_Callback *copy_callback_;
 
     /// Flag that indicates if the TSC is to be copied to the RSC.
     /**
diff --git a/TAO/tao/PI_Server/PI_Server_include.pidl b/TAO/tao/PI_Server/PI_Server_include.pidl
new file mode 100644
index 00000000000..0b86cdf7238
--- /dev/null
+++ b/TAO/tao/PI_Server/PI_Server_include.pidl
@@ -0,0 +1,15 @@
+/**
+ * @file PI_Server_include.pidl
+ *
+ * $Id$
+ *
+ * @brief Include file for use in applications that need PI_Server.pidl.
+ */
+
+#ifndef _PORTABLESERVER_INCLUDE_IDL_
+#define _PORTABLESERVER_INCLUDE_IDL_
+
+///FUZZ: disable check_for_include/
+#include <tao/PI_Server/ServerRequestInterceptor.pidl>
+
+#endif /* _PORTABLESERVER_INCLUDE_IDL_ */
diff --git a/TAO/tao/PI_Server/PI_Server_includeA.h b/TAO/tao/PI_Server/PI_Server_includeA.h
new file mode 100644
index 00000000000..44c20559645
--- /dev/null
+++ b/TAO/tao/PI_Server/PI_Server_includeA.h
@@ -0,0 +1,44 @@
+// -*- 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/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:390
+
+#ifndef _TAO_IDL_ORIG_PI_SERVER_INCLUDEA_H_
+#define _TAO_IDL_ORIG_PI_SERVER_INCLUDEA_H_
+
+#include /**/ "ace/pre.h"
+
+#include "tao/PI_Server/PI_Server_includeC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "ace/post.h"
+#endif /* ifndef */
+
diff --git a/TAO/tao/PI_Server/PI_Server_includeC.h b/TAO/tao/PI_Server/PI_Server_includeC.h
new file mode 100644
index 00000000000..2f941a52b2e
--- /dev/null
+++ b/TAO/tao/PI_Server/PI_Server_includeC.h
@@ -0,0 +1,56 @@
+// -*- 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/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:153
+
+#ifndef _TAO_IDL_ORIG_PI_SERVER_INCLUDEC_H_
+#define _TAO_IDL_ORIG_PI_SERVER_INCLUDEC_H_
+
+#include /**/ "ace/pre.h"
+
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "pi_server_export.h"
+
+#include "tao/PI_Server/ServerRequestInterceptorC.h"
+
+// TAO_IDL - Generated from
+// be\be_visitor_traits.cpp:61
+
+// Traits specializations.
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
+
diff --git a/TAO/tao/AnySeqS.h b/TAO/tao/PI_Server/PI_Server_includeS.h
index 17b1360599e..dc5cdcf7c2b 100644
--- a/TAO/tao/AnySeqS.h
+++ b/TAO/tao/PI_Server/PI_Server_includeS.h
@@ -25,4 +25,17 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-// Skeleton file generation suppressed with command line option -SS
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:390
+
+#ifndef _TAO_IDL_ORIG_PORTABLESERVER_INCLUDES_H_
+#define _TAO_IDL_ORIG_PORTABLESERVER_INCLUDES_H_
+
+#include /**/ "ace/pre.h"
+
+#include "tao/PI_Server/ServerRequestInterceptorS.h"
+#include "tao/PI_Server/PI_Server_includeC.h"
+
+#include /**/ "ace/post.h"
+#endif /* ifndef */
+
diff --git a/TAO/tao/PI_Server/POA_Current.cpp b/TAO/tao/PI_Server/POA_Current.cpp
index cf696518b9f..0a53d6802d9 100644
--- a/TAO/tao/PI_Server/POA_Current.cpp
+++ b/TAO/tao/PI_Server/POA_Current.cpp
@@ -63,14 +63,14 @@ namespace TAO
     POA_Current::implementation (void)
     {
       return static_cast <POA_Current_Impl *>
-                        (TAO_TSS_RESOURCES::instance ()->poa_current_impl_);
+                        (TAO_TSS_Resources::instance ()->poa_current_impl_);
     }
 
     POA_Current_Impl *
     POA_Current::implementation (POA_Current_Impl *new_current)
     {
       TAO_TSS_Resources *tss =
-        TAO_TSS_RESOURCES::instance ();
+        TAO_TSS_Resources::instance ();
 
       POA_Current_Impl *old =
         static_cast <POA_Current_Impl *>
diff --git a/TAO/tao/PI_Server/PS_CurrentA.cpp b/TAO/tao/PI_Server/PS_CurrentA.cpp
index fd0ff6f7c7e..05de30be3a2 100644
--- a/TAO/tao/PI_Server/PS_CurrentA.cpp
+++ b/TAO/tao/PI_Server/PS_CurrentA.cpp
@@ -26,16 +26,16 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "PS_CurrentC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/struct_typecode.cpp:87
@@ -51,7 +51,7 @@ static TAO::TypeCode::Struct<char const *,
     "NoContext",
     _tao_fields_PortableServer_Current_NoContext,
     0);
-  
+
 ::CORBA::TypeCode_ptr const PortableServer::Current::_tc_NoContext =
   &_tao_tc_PortableServer_Current_NoContext;
 
@@ -64,7 +64,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/PortableServer/Current:2.3",
     "Current");
-  
+
 namespace PortableServer
 {
   ::CORBA::TypeCode_ptr const _tc_Current =
@@ -97,7 +97,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<PortableServer::Current>::demarshal_value (TAO_InputCDR &)
@@ -148,7 +148,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 namespace TAO
@@ -159,7 +159,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Dual_Impl_T<PortableServer::Current::NoContext>::demarshal_value (TAO_InputCDR &)
diff --git a/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp b/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp
index 23b62c798b1..6355bda6942 100644
--- a/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp
+++ b/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp
@@ -9,12 +9,15 @@ ACE_RCSID (PortableServer,
            "$Id$")
 
 #include "ServerRequestInfo.h"
-#include "tao/PortableServer/PICurrent_Guard.h"
+#include "PICurrent_Guard.h"
 
 #include "tao/ServerRequestInterceptor_Adapter.h"
 #include "tao/TAO_Server_Request.h"
 #include "tao/ORB_Core.h"
-
+#include "tao/PI/PICurrent_Impl.h"
+#include "tao/PI/PICurrent_Copy_Callback.h"
+#include "tao/PortableServer/Upcall_Command.h"
+#include "tao/PortableInterceptor.h"
 
 TAO::ServerRequestInterceptor_Adapter_Impl::ServerRequestInterceptor_Adapter_Impl (void)
 {
@@ -231,6 +234,9 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request (
                                        exceptions,
                                        nexceptions);
 
+  TAO::PICurrent_Guard pi_guard (server_request,
+                                 true  /* Copy TSC to RSC */);
+
   ACE_TRY
     {
       for (size_t i = 0; i < server_request.interceptor_count (); ++i)
@@ -478,4 +484,53 @@ TAO::ServerRequestInterceptor_Adapter_Impl::destroy_interceptors (
   this->interceptor_list_.destroy_interceptors (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
+TAO::PICurrent_Impl *
+TAO::ServerRequestInterceptor_Adapter_Impl::allocate_pi_current (void)
+{
+  TAO::PICurrent_Impl *pi = 0;
+  ACE_NEW_RETURN (pi,
+                  TAO::PICurrent_Impl,
+                  0);
+  return pi;
+}
+
+TAO::PICurrent_Copy_Callback *
+TAO::ServerRequestInterceptor_Adapter_Impl::allocate_pi_current_callback (void)
+{
+  TAO::PICurrent_Copy_Callback *pi = 0;
+  ACE_NEW_RETURN (pi,
+                  TAO::PICurrent_Copy_Callback,
+                  0);
+  return pi;
+}
+
+void
+TAO::ServerRequestInterceptor_Adapter_Impl::deallocate_pi_current (
+        TAO::PICurrent_Impl *picurrent)
+{
+  delete picurrent;
+}
+
+void
+TAO::ServerRequestInterceptor_Adapter_Impl::deallocate_pi_current_callback (
+  TAO::PICurrent_Copy_Callback *callback)
+{
+  delete callback;
+}
+
+void
+TAO::ServerRequestInterceptor_Adapter_Impl::execute_command (
+  TAO_ServerRequest &server_request,
+  TAO::Upcall_Command &command
+  ACE_ENV_ARG_DECL)
+{
+  TAO::PICurrent_Guard pi_guard (server_request,
+                                 true  /* Copy TSC to RSC */);
+
+  // The actual upcall.
+  command.execute (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+}
+
+
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tao/PI_Server/ServerInterceptorAdapter.h b/TAO/tao/PI_Server/ServerInterceptorAdapter.h
index 97be061c7ef..1cf01b210f3 100644
--- a/TAO/tao/PI_Server/ServerInterceptorAdapter.h
+++ b/TAO/tao/PI_Server/ServerInterceptorAdapter.h
@@ -154,6 +154,22 @@ namespace TAO
 
     virtual void destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL);
 
+    virtual TAO::PICurrent_Impl *allocate_pi_current (void);
+
+    virtual TAO::PICurrent_Copy_Callback *
+        allocate_pi_current_callback (void);
+
+    virtual void deallocate_pi_current (
+        TAO::PICurrent_Impl *picurrent);
+
+    virtual void deallocate_pi_current_callback (
+        TAO::PICurrent_Copy_Callback *callback);
+
+    virtual void execute_command (
+        TAO_ServerRequest &server_request,
+        TAO::Upcall_Command &command
+        ACE_ENV_ARG_DECL);
+
   private:
 
     /// List of registered interceptors.
diff --git a/TAO/tao/PI_Server/ServerRequestInfo.cpp b/TAO/tao/PI_Server/ServerRequestInfo.cpp
index 33c9d149cc1..2b613ec3738 100644
--- a/TAO/tao/PI_Server/ServerRequestInfo.cpp
+++ b/TAO/tao/PI_Server/ServerRequestInfo.cpp
@@ -15,10 +15,13 @@ ACE_RCSID (PortableServer,
 #include "tao/TAO_Server_Request.h"
 #include "tao/ORB_Core.h"
 #include "tao/PolicyC.h"
-#include "tao/DynamicC.h"
+#include "tao/AnyTypeCode/DynamicC.h"
 #include "tao/ORB_Core.h"
 #include "tao/Service_Context.h"
-#include "tao/RequestInfo_Util.h"
+#include "tao/PI/RequestInfo_Util.h"
+#include "tao/PI/PICurrent.h"
+#include "tao/PI/PICurrent_Impl.h"
+#include "tao/AnyTypeCode/ExceptionA.h"
 
 #include "ace/OS_NS_string.h"
 
@@ -107,7 +110,9 @@ TAO::ServerRequestInfo::arguments (ACE_ENV_SINGLE_ARG_DECL)
     {
       // Insert the operation parameters into the
       // Dynamic::ParameterList.
-      (*i)->interceptor_param ((*parameter_list)[p]);
+      Dynamic::Parameter& parameter = (*parameter_list)[p];
+      parameter.mode = (*i)->mode ();
+      (*i)->interceptor_value (&parameter.argument);
     }
 
   return safe_parameter_list._retn ();
@@ -191,7 +196,7 @@ TAO::ServerRequestInfo::result (ACE_ENV_SINGLE_ARG_DECL)
   // Result is always first element in TAO::Argument array.
   TAO::Argument * const r = this->args_[0];
 
-  r->interceptor_result (result_any);
+  r->interceptor_value (result_any);
 
   return safe_result_any._retn ();
 }
@@ -250,9 +255,12 @@ TAO::ServerRequestInfo::get_slot (PortableInterceptor::SlotId id
 {
   // Retrieve the total number of assigned slots from the PICurrent.
   // No TSS access is incurred.
-  TAO::PICurrent * pi_current =
+  CORBA::Object_ptr pi_current_obj =
     this->server_request_.orb_core ()->pi_current ();
 
+  TAO::PICurrent *pi_current =
+    dynamic_cast <TAO::PICurrent*> (pi_current_obj);
+
   if (pi_current == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
@@ -260,9 +268,9 @@ TAO::ServerRequestInfo::get_slot (PortableInterceptor::SlotId id
   ACE_CHECK_RETURN (0);
 
   // Retrieve the request scope PICurrent object.
-  TAO::PICurrent_Impl &rsc = this->server_request_.rs_pi_current ();
+  TAO::PICurrent_Impl *rsc = this->server_request_.rs_pi_current ();
 
-  return rsc.get_slot (id ACE_ENV_ARG_PARAMETER);
+  return rsc->get_slot (id ACE_ENV_ARG_PARAMETER);
 
 }
 
@@ -517,9 +525,12 @@ TAO::ServerRequestInfo::set_slot (PortableInterceptor::SlotId id,
 {
   // Retrieve the total number of assigned slots from the PICurrent
   // object.  No TSS access is incurred.
-  TAO::PICurrent * pi_current =
+  CORBA::Object_ptr pi_current_obj =
     this->server_request_.orb_core ()->pi_current ();
 
+  TAO::PICurrent *pi_current =
+    dynamic_cast <TAO::PICurrent*> (pi_current_obj);
+
   if (pi_current == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
@@ -527,9 +538,9 @@ TAO::ServerRequestInfo::set_slot (PortableInterceptor::SlotId id,
   ACE_CHECK;
 
   // Retrieve the "request scope current" (RSC).
-  TAO::PICurrent_Impl & rsc = this->server_request_.rs_pi_current ();
+  TAO::PICurrent_Impl * rsc = this->server_request_.rs_pi_current ();
 
-  rsc.set_slot (id, data ACE_ENV_ARG_PARAMETER);
+  rsc->set_slot (id, data ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
diff --git a/TAO/tao/PI_Server/ServerRequestInfoA.cpp b/TAO/tao/PI_Server/ServerRequestInfoA.cpp
index b97a8646554..1dc8ac2a761 100644
--- a/TAO/tao/PI_Server/ServerRequestInfoA.cpp
+++ b/TAO/tao/PI_Server/ServerRequestInfoA.cpp
@@ -26,14 +26,14 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "ServerRequestInfoC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/objref_typecode.cpp:76
@@ -44,7 +44,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/PortableInterceptor/ServerRequestInfo:1.0",
     "ServerRequestInfo");
-  
+
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_ServerRequestInfo =
@@ -77,7 +77,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<PortableInterceptor::ServerRequestInfo>::demarshal_value (TAO_InputCDR &)
diff --git a/TAO/tao/PI_Server/ServerRequestInfoC.h b/TAO/tao/PI_Server/ServerRequestInfoC.h
index 99849c7b129..ef918d43a45 100644
--- a/TAO/tao/PI_Server/ServerRequestInfoC.h
+++ b/TAO/tao/PI_Server/ServerRequestInfoC.h
@@ -45,9 +45,9 @@
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Any.h"
-#include "tao/TypeCode.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/Objref_VarOut_T.h"
 
 #include "tao/PI/RequestInfoC.h"
@@ -201,10 +201,10 @@ namespace PortableInterceptor
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::Policy_ptr get_server_policy (
         ::CORBA::PolicyType type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -212,10 +212,10 @@ namespace PortableInterceptor
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void set_slot (
         ::PortableInterceptor::SlotId id,
         const ::CORBA::Any & data
@@ -225,10 +225,10 @@ namespace PortableInterceptor
         CORBA::SystemException,
         ::PortableInterceptor::InvalidSlot
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Boolean target_is_a (
         const char * id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -236,10 +236,10 @@ namespace PortableInterceptor
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void add_reply_service_context (
         const ::IOP::ServiceContext & service_context,
         ::CORBA::Boolean replace
@@ -248,36 +248,36 @@ namespace PortableInterceptor
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     ServerRequestInfo (void);
-    
+
     virtual ~ServerRequestInfo (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     ServerRequestInfo (const ServerRequestInfo &);
-    
+
     void operator= (const ServerRequestInfo &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   extern TAO_PI_Server_Export ::CORBA::TypeCode_ptr const _tc_ServerRequestInfo;
 
 // TAO_IDL - Generated from
@@ -294,7 +294,7 @@ namespace TAO
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_CH_
-  
+
   template<>
   struct TAO_PI_Server_Export Objref_Traits< ::PortableInterceptor::ServerRequestInfo>
   {
diff --git a/TAO/tao/PI_Server/ServerRequestInterceptorA.cpp b/TAO/tao/PI_Server/ServerRequestInterceptorA.cpp
index 7ff84e2a730..58a08ac8132 100644
--- a/TAO/tao/PI_Server/ServerRequestInterceptorA.cpp
+++ b/TAO/tao/PI_Server/ServerRequestInterceptorA.cpp
@@ -26,14 +26,14 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "ServerRequestInterceptorC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/objref_typecode.cpp:76
@@ -44,7 +44,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/PortableInterceptor/ServerRequestInterceptor:1.0",
     "ServerRequestInterceptor");
-  
+
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_ServerRequestInterceptor =
@@ -77,7 +77,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>::demarshal_value (TAO_InputCDR &)
diff --git a/TAO/tao/ParameterModeA.cpp b/TAO/tao/ParameterModeA.cpp
deleted file mode 100644
index 7014fcef47a..00000000000
--- a/TAO/tao/ParameterModeA.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-// -*- 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/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "ParameterModeC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Enum_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Basic_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/enum_typecode.cpp:34
-
-static char const * const _tao_enumerators_CORBA_ParameterMode[] =
-  {
-    "PARAM_IN",
-    "PARAM_OUT",
-    "PARAM_INOUT"
-    
-  };
-
-static TAO::TypeCode::Enum<char const *,
-                           char const * const *,
-                           TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ParameterMode (
-    "IDL:omg.org/CORBA/ParameterMode:1.0",
-    "ParameterMode",
-    _tao_enumerators_CORBA_ParameterMode,
-    3);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ParameterMode =
-    &_tao_tc_CORBA_ParameterMode;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_cs.cpp:52
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ParameterMode _tao_elem
-  )
-{
-  TAO::Any_Basic_Impl_T<CORBA::ParameterMode>::insert (
-      _tao_any,
-      CORBA::_tc_ParameterMode,
-      _tao_elem
-    );
-}
-
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ParameterMode &_tao_elem
-  )
-{
-  return
-    TAO::Any_Basic_Impl_T<CORBA::ParameterMode>::extract (
-        _tao_any,
-        CORBA::_tc_ParameterMode,
-        _tao_elem 
-      );
-}
diff --git a/TAO/tao/ParameterModeC.h b/TAO/tao/ParameterModeC.h
index 8f03c9dcb15..641439da90d 100644
--- a/TAO/tao/ParameterModeC.h
+++ b/TAO/tao/ParameterModeC.h
@@ -63,23 +63,18 @@
 
 namespace CORBA
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_enum/enum_ch.cpp:57
-  
+
   enum ParameterMode
   {
     PARAM_IN,
     PARAM_OUT,
     PARAM_INOUT
   };
-  
+
   typedef ParameterMode &ParameterMode_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ParameterMode;
 
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:66
@@ -95,12 +90,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_ch.cpp:51
-
-TAO_Export void operator<<= (CORBA::Any &, CORBA::ParameterMode);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ParameterMode &);
-
-// TAO_IDL - Generated from
 // be\be_visitor_enum/cdr_op_ch.cpp:50
 
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, CORBA::ParameterMode);
diff --git a/TAO/tao/PolicyA.cpp b/TAO/tao/PolicyA.cpp
deleted file mode 100644
index 67be5692475..00000000000
--- a/TAO/tao/PolicyA.cpp
+++ /dev/null
@@ -1,555 +0,0 @@
-// -*- 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/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "PolicyC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_PolicyErrorCode (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/PolicyErrorCode:1.0",
-    "PolicyErrorCode",
-    &CORBA::_tc_short);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_PolicyErrorCode =
-    &_tao_tc_CORBA_PolicyErrorCode;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_PolicyError[] =
-  {
-    { "reason", &CORBA::_tc_PolicyErrorCode }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_PolicyError (
-    CORBA::tk_except,
-    "IDL:omg.org/CORBA/PolicyError:1.0",
-    "PolicyError",
-    _tao_fields_CORBA_PolicyError,
-    1);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_PolicyError =
-    &_tao_tc_CORBA_PolicyError;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_InvalidPolicies[] =
-  {
-    { "indices", &CORBA::_tc_UShortSeq }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_InvalidPolicies (
-    CORBA::tk_except,
-    "IDL:omg.org/CORBA/InvalidPolicies:1.0",
-    "InvalidPolicies",
-    _tao_fields_CORBA_InvalidPolicies,
-    1);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_InvalidPolicies =
-    &_tao_tc_CORBA_InvalidPolicies;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_Policy (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/Policy:1.0",
-    "Policy");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_Policy =
-    &_tao_tc_CORBA_Policy;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_PolicyManager (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/CORBA/PolicyManager:1.0",
-    "PolicyManager");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_PolicyManager =
-    &_tao_tc_CORBA_PolicyManager;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_PolicyCurrent (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/CORBA/PolicyCurrent:1.0",
-    "PolicyCurrent");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_PolicyCurrent =
-    &_tao_tc_CORBA_PolicyCurrent;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<CORBA::PolicyError>::demarshal_value (
-      TAO_InputCDR & cdr
-    )
-  {
-    CORBA::String_var id;
-    
-    if (!(cdr >> id.out ()))
-      {
-        return false;
-      }
-    
-    ACE_TRY_NEW_ENV
-      {
-        this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-      }
-    ACE_CATCHANY
-      {
-        return false;
-      }
-    ACE_ENDTRY;
-    
-    return true;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::PolicyError &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::PolicyError>::insert_copy (
-      _tao_any,
-      CORBA::PolicyError::_tao_any_destructor,
-      CORBA::_tc_PolicyError,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::PolicyError *_tao_elem
-  )
-{
-  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
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::PolicyError *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::PolicyError *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::PolicyError>::extract (
-        _tao_any,
-        CORBA::PolicyError::_tao_any_destructor,
-        CORBA::_tc_PolicyError,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<CORBA::InvalidPolicies>::demarshal_value (
-      TAO_InputCDR & cdr
-    )
-  {
-    CORBA::String_var id;
-    
-    if (!(cdr >> id.out ()))
-      {
-        return false;
-      }
-    
-    ACE_TRY_NEW_ENV
-      {
-        this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-      }
-    ACE_CATCHANY
-      {
-        return false;
-      }
-    ACE_ENDTRY;
-    
-    return true;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::InvalidPolicies &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::InvalidPolicies>::insert_copy (
-      _tao_any,
-      CORBA::InvalidPolicies::_tao_any_destructor,
-      CORBA::_tc_InvalidPolicies,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::InvalidPolicies *_tao_elem
-  )
-{
-  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
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::InvalidPolicies *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::InvalidPolicies *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::InvalidPolicies>::extract (
-        _tao_any,
-        CORBA::InvalidPolicies::_tao_any_destructor,
-        CORBA::_tc_InvalidPolicies,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::Policy>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::Policy_ptr _tao_elem
-  )
-{
-  CORBA::Policy_ptr _tao_objptr =
-    CORBA::Policy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::Policy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::Policy>::insert (
-      _tao_any,
-      CORBA::Policy::_tao_any_destructor,
-      CORBA::_tc_Policy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::Policy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::Policy>::extract (
-        _tao_any,
-        CORBA::Policy::_tao_any_destructor,
-        CORBA::_tc_Policy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::PolicyManager>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::PolicyManager>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::PolicyManager>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::PolicyManager_ptr _tao_elem
-  )
-{
-  CORBA::PolicyManager_ptr _tao_objptr =
-    CORBA::PolicyManager::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::PolicyManager_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::PolicyManager>::insert (
-      _tao_any,
-      CORBA::PolicyManager::_tao_any_destructor,
-      CORBA::_tc_PolicyManager,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::PolicyManager_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::PolicyManager>::extract (
-        _tao_any,
-        CORBA::PolicyManager::_tao_any_destructor,
-        CORBA::_tc_PolicyManager,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::PolicyCurrent>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::PolicyCurrent>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::PolicyCurrent>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::PolicyCurrent_ptr _tao_elem
-  )
-{
-  CORBA::PolicyCurrent_ptr _tao_objptr =
-    CORBA::PolicyCurrent::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::PolicyCurrent_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::PolicyCurrent>::insert (
-      _tao_any,
-      CORBA::PolicyCurrent::_tao_any_destructor,
-      CORBA::_tc_PolicyCurrent,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::PolicyCurrent_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::PolicyCurrent>::extract (
-        _tao_any,
-        CORBA::PolicyCurrent::_tao_any_destructor,
-        CORBA::_tc_PolicyCurrent,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp
index 7d0b9432492..606c217d2bf 100644
--- a/TAO/tao/PolicyC.cpp
+++ b/TAO/tao/PolicyC.cpp
@@ -31,12 +31,13 @@
 
 #include "PolicyC.h"
 #include "tao/CDR.h"
-#include "tao/Exception_Data.h"
 #include "tao/Invocation_Adapter.h"
 #include "tao/Object_T.h"
 #include "tao/Basic_Arguments.h"
 #include "tao/Object_Argument_T.h"
 #include "ace/OS_NS_string.h"
+#include "tao/AnyTypeCode_Adapter.h"
+#include "ace/Dynamic_Service.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -49,13 +50,31 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+// TAO specific stuff.
+namespace CORBA
+{
+  class Policy;
+  typedef Policy *Policy_ptr;
+  typedef TAO_Objref_Var_T<Policy> Policy_var;
+  typedef TAO_Objref_Out_T<Policy> Policy_out;
+}
+
+namespace TAO
+{
+
+#if TAO_HAS_INTERCEPTORS == 1
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+}
+
 // Arg traits specializations.
 namespace TAO
 {
 
 #if !defined (_CORBA_POLICY__ARG_TRAITS_CS_)
 #define _CORBA_POLICY__ARG_TRAITS_CS_
-  
+
   template<>
   class  Arg_Traits<CORBA::Policy>
     : public
@@ -63,7 +82,8 @@ namespace TAO
             CORBA::Policy_ptr,
             CORBA::Policy_var,
             CORBA::Policy_out,
-            TAO::Objref_Traits<CORBA::Policy>
+            TAO::Objref_Traits<CORBA::Policy>,
+            TAO::Any_Insert_Policy_AnyTypeCode_Adapter <CORBA::Policy_ptr>
           >
   {
   };
@@ -72,7 +92,7 @@ namespace TAO
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 CORBA::PolicyError::PolicyError (void)
@@ -156,7 +176,7 @@ void CORBA::PolicyError::_tao_encode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -169,7 +189,7 @@ void CORBA::PolicyError::_tao_decode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -192,10 +212,23 @@ CORBA::PolicyError::PolicyError (
 // TAO extension - the virtual _type method.
 CORBA::TypeCode_ptr CORBA::PolicyError::_tao_type (void) const
 {
-  return ::CORBA::_tc_PolicyError;
+  TAO_AnyTypeCode_Adapter *adapter =
+    ACE_Dynamic_Service<TAO_AnyTypeCode_Adapter>::instance (
+        "AnyTypeCode_Adapter"
+      );
+  if (adapter != 0)
+    return adapter->_tao_type_PolicyError ();
+  else
+    {
+      ACE_ERROR ((LM_ERROR,
+                  ACE_TEXT ("(%P|%t) %p\n"),
+                  ACE_TEXT ("Unable to find the ")
+                  ACE_TEXT ("AnyTypeCode Adapter instance")));
+      return 0;
+    }
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 CORBA::InvalidPolicies::InvalidPolicies (void)
@@ -279,7 +312,7 @@ void CORBA::InvalidPolicies::_tao_encode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -292,7 +325,7 @@ void CORBA::InvalidPolicies::_tao_decode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -315,7 +348,20 @@ CORBA::InvalidPolicies::InvalidPolicies (
 // TAO extension - the virtual _type method.
 CORBA::TypeCode_ptr CORBA::InvalidPolicies::_tao_type (void) const
 {
-  return ::CORBA::_tc_InvalidPolicies;
+  TAO_AnyTypeCode_Adapter *adapter =
+    ACE_Dynamic_Service<TAO_AnyTypeCode_Adapter>::instance (
+        "AnyTypeCode_Adapter"
+      );
+  if (adapter != 0)
+    return adapter->_tao_type_InvalidPolicies ();
+  else
+    {
+      ACE_ERROR ((LM_ERROR,
+                  ACE_TEXT ("(%P|%t) %p\n"),
+                  ACE_TEXT ("Unable to find the ")
+                  ACE_TEXT ("AnyTypeCode Adapter instance")));
+      return 0;
+    }
 }
 
 // TAO_IDL - Generated from
@@ -355,7 +401,7 @@ TAO::Objref_Traits<CORBA::Policy>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_Policy_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -374,19 +420,19 @@ CORBA::PolicyType CORBA::Policy::policy_type (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Policy_Proxy_Broker_ == 0)
     {
       CORBA_Policy_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::PolicyType>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -395,10 +441,10 @@ CORBA::PolicyType CORBA::Policy::policy_type (
       16,
       this->the_TAO_Policy_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -416,19 +462,19 @@ CORBA::PolicyType CORBA::Policy::policy_type (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Policy_Proxy_Broker_ == 0)
     {
       CORBA_Policy_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::Policy>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -437,10 +483,10 @@ CORBA::PolicyType CORBA::Policy::policy_type (
       4,
       this->the_TAO_Policy_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -458,19 +504,19 @@ void CORBA::Policy::destroy (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Policy_Proxy_Broker_ == 0)
     {
       CORBA_Policy_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -479,7 +525,7 @@ void CORBA::Policy::destroy (
       7,
       this->the_TAO_Policy_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -503,7 +549,7 @@ CORBA::Policy::CORBA_Policy_setup_collocation ()
 CORBA::Policy::~Policy (void)
 {}
 
-void 
+void
 CORBA::Policy::_tao_any_destructor (void *_tao_void_pointer)
 {
   Policy *_tao_tmp_pointer =
@@ -548,7 +594,7 @@ CORBA::Policy::_duplicate (Policy_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -639,7 +685,7 @@ CORBA::PolicyManager::PolicyManager (void)
 CORBA::PolicyManager::~PolicyManager (void)
 {}
 
-void 
+void
 CORBA::PolicyManager::_tao_any_destructor (void *_tao_void_pointer)
 {
   PolicyManager *_tao_tmp_pointer =
@@ -676,7 +722,7 @@ CORBA::PolicyManager::_duplicate (PolicyManager_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -768,7 +814,7 @@ CORBA::PolicyCurrent::PolicyCurrent (void)
 CORBA::PolicyCurrent::~PolicyCurrent (void)
 {}
 
-void 
+void
 CORBA::PolicyCurrent::_tao_any_destructor (void *_tao_void_pointer)
 {
   PolicyCurrent *_tao_tmp_pointer =
@@ -805,7 +851,7 @@ CORBA::PolicyCurrent::_duplicate (PolicyCurrent_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -975,20 +1021,20 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::CORBA::Policy RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA__TAO_Policy_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h
index 6c04ac532f1..3346c12a828 100644
--- a/TAO/tao/PolicyC.h
+++ b/TAO/tao/PolicyC.h
@@ -65,7 +65,7 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_root/root_ch.cpp:62
 
 namespace TAO
@@ -79,67 +79,62 @@ namespace TAO
 
 namespace CORBA
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:379
-  
+
   typedef CORBA::Short PolicyErrorCode;
   typedef CORBA::Short_out PolicyErrorCode_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_PolicyErrorCode;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const CORBA::PolicyErrorCode BAD_POLICY = 0;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const CORBA::PolicyErrorCode UNSUPPORTED_POLICY = 1;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const CORBA::PolicyErrorCode BAD_POLICY_TYPE = 2;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const CORBA::PolicyErrorCode BAD_POLICY_VALUE = 3;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const CORBA::PolicyErrorCode UNSUPPORTED_POLICY_VALUE = 4;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_exception/exception_ch.cpp:53
 
 #if !defined (_CORBA_POLICYERROR_CH_)
 #define _CORBA_POLICYERROR_CH_
-  
+
   class TAO_Export PolicyError : public CORBA::UserException
   {
   public:
-    
+
     CORBA::PolicyErrorCode reason;
     PolicyError (void);
     PolicyError (const PolicyError &);
     ~PolicyError (void);
 
     PolicyError &operator= (const PolicyError &);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     static PolicyError *_downcast (CORBA::Exception *);
     static const PolicyError *_downcast (CORBA::Exception const *);
-    
+
     static CORBA::Exception *_alloc (void);
-    
+
     virtual CORBA::Exception *_tao_duplicate (void) const;
 
     virtual void _raise (void) const;
@@ -148,56 +143,51 @@ namespace CORBA
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL
       ) const;
-    
+
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ctor.cpp:66
-    
+
     PolicyError (
         ACE_NESTED_CLASS (CORBA, PolicyErrorCode) _tao_reason
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:129
-    
+
     virtual CORBA::TypeCode_ptr _tao_type (void) const;
   };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_PolicyError;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_exception/exception_ch.cpp:53
 
 #if !defined (_CORBA_INVALIDPOLICIES_CH_)
 #define _CORBA_INVALIDPOLICIES_CH_
-  
+
   class TAO_Export InvalidPolicies : public CORBA::UserException
   {
   public:
-    
+
     CORBA::UShortSeq indices;
     InvalidPolicies (void);
     InvalidPolicies (const InvalidPolicies &);
     ~InvalidPolicies (void);
 
     InvalidPolicies &operator= (const InvalidPolicies &);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     static InvalidPolicies *_downcast (CORBA::Exception *);
     static const InvalidPolicies *_downcast (CORBA::Exception const *);
-    
+
     static CORBA::Exception *_alloc (void);
-    
+
     virtual CORBA::Exception *_tao_duplicate (void) const;
 
     virtual void _raise (void) const;
@@ -206,47 +196,42 @@ namespace CORBA
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL
       ) const;
-    
+
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ctor.cpp:66
-    
+
     InvalidPolicies (
         const ACE_NESTED_CLASS (CORBA, UShortSeq) & _tao_indices
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:129
-    
+
     virtual CORBA::TypeCode_ptr _tao_type (void) const;
   };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_InvalidPolicies;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_POLICY__VAR_OUT_CH_)
 #define _CORBA_POLICY__VAR_OUT_CH_
-  
+
   class Policy;
   typedef Policy *Policy_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         Policy
       >
     Policy_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         Policy
@@ -254,13 +239,13 @@ namespace CORBA
     Policy_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_POLICY_CH_)
 #define _CORBA_POLICY_CH_
-  
+
   class TAO_Export Policy
     : public virtual CORBA::Object
   {
@@ -268,67 +253,67 @@ namespace CORBA
     friend class TAO::Narrow_Utils<Policy>;
     typedef Policy_ptr _ptr_type;
     typedef Policy_var _var_type;
-    
+
     // The static operations.
     static Policy_ptr _duplicate (Policy_ptr obj);
-    
+
     static void _tao_release (Policy_ptr obj);
-    
+
     static Policy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static Policy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static Policy_ptr _nil (void)
     {
       return static_cast<Policy_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // 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
     // 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
     // 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:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 
@@ -342,21 +327,21 @@ namespace CORBA
 
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_Policy_Proxy_Broker_;
-  
+
   protected:
     // Concrete interface only.
     Policy (void);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_Policy_setup_collocation (void);
-    
+
     // Concrete non-local interface only.
     Policy (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     // Non-local interface only.
     Policy (
         TAO_Stub *objref,
@@ -364,38 +349,33 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     virtual ~Policy (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     Policy (const Policy &);
-    
+
     void operator= (const Policy &);
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_Policy;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_POLICYMANAGER__VAR_OUT_CH_)
 #define _CORBA_POLICYMANAGER__VAR_OUT_CH_
-  
+
   class PolicyManager;
   typedef PolicyManager *PolicyManager_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         PolicyManager
       >
     PolicyManager_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         PolicyManager
@@ -403,45 +383,45 @@ namespace CORBA
     PolicyManager_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_POLICYMANAGER_CH_)
 #define _CORBA_POLICYMANAGER_CH_
-  
+
   class TAO_Export PolicyManager
     : public virtual CORBA::Object
   {
   public:
     typedef PolicyManager_ptr _ptr_type;
     typedef PolicyManager_var _var_type;
-    
+
     // The static operations.
     static PolicyManager_ptr _duplicate (PolicyManager_ptr obj);
-    
+
     static void _tao_release (PolicyManager_ptr obj);
-    
+
     static PolicyManager_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static PolicyManager_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static PolicyManager_ptr _nil (void)
     {
       return static_cast<PolicyManager_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::PolicyList * get_policy_overrides (
         const ::CORBA::PolicyTypeSeq & ts
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -449,10 +429,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void set_policy_overrides (
         const ::CORBA::PolicyList & policies,
         ::CORBA::SetOverrideType set_add
@@ -462,53 +442,48 @@ namespace CORBA
         CORBA::SystemException,
         ::CORBA::InvalidPolicies
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     PolicyManager (void);
-    
+
     virtual ~PolicyManager (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     PolicyManager (const PolicyManager &);
-    
+
     void operator= (const PolicyManager &);
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_PolicyManager;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_POLICYCURRENT__VAR_OUT_CH_)
 #define _CORBA_POLICYCURRENT__VAR_OUT_CH_
-  
+
   class PolicyCurrent;
   typedef PolicyCurrent *PolicyCurrent_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         PolicyCurrent
       >
     PolicyCurrent_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         PolicyCurrent
@@ -516,13 +491,13 @@ namespace CORBA
     PolicyCurrent_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_POLICYCURRENT_CH_)
 #define _CORBA_POLICYCURRENT_CH_
-  
+
   class TAO_Export PolicyCurrent
     : public virtual ::CORBA::PolicyManager,
       public virtual ::CORBA::Current
@@ -530,59 +505,54 @@ namespace CORBA
   public:
     typedef PolicyCurrent_ptr _ptr_type;
     typedef PolicyCurrent_var _var_type;
-    
+
     // The static operations.
     static PolicyCurrent_ptr _duplicate (PolicyCurrent_ptr obj);
-    
+
     static void _tao_release (PolicyCurrent_ptr obj);
-    
+
     static PolicyCurrent_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static PolicyCurrent_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static PolicyCurrent_ptr _nil (void)
     {
       return static_cast<PolicyCurrent_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     PolicyCurrent (void);
-    
+
     virtual ~PolicyCurrent (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     PolicyCurrent (const PolicyCurrent &);
-    
+
     void operator= (const PolicyCurrent &);
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_PolicyCurrent;
 
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:66
@@ -607,9 +577,9 @@ TAO::Collocation_Proxy_Broker *
 namespace TAO
 {
 
-#if !defined (_CORBA_POLICY__TRAITS_CH_)
-#define _CORBA_POLICY__TRAITS_CH_
-  
+#if !defined (_CORBA_POLICY__TRAITS_)
+#define _CORBA_POLICY__TRAITS_
+
   template<>
   struct TAO_Export Objref_Traits< ::CORBA::Policy>
   {
@@ -630,7 +600,7 @@ namespace TAO
 
 #if !defined (_CORBA_POLICYMANAGER__TRAITS_CH_)
 #define _CORBA_POLICYMANAGER__TRAITS_CH_
-  
+
   template<>
   struct TAO_Export Objref_Traits< ::CORBA::PolicyManager>
   {
@@ -649,9 +619,9 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_POLICYCURRENT__TRAITS_CH_)
-#define _CORBA_POLICYCURRENT__TRAITS_CH_
-  
+#if !defined (_CORBA_POLICYCURRENT__TRAITS_)
+#define _CORBA_POLICYCURRENT__TRAITS_
+
   template<>
   struct TAO_Export Objref_Traits< ::CORBA::PolicyCurrent>
   {
@@ -672,43 +642,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// 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
-// 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 *&);
-
-// TAO_IDL - Generated from
-// 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 &);
-
-// TAO_IDL - Generated from
-// 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 &);
-
-// TAO_IDL - Generated from
-// 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
 // be\be_visitor_exception/cdr_op_ch.cpp:52
 
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::PolicyError &);
diff --git a/TAO/tao/Policy_Current.cpp b/TAO/tao/Policy_Current.cpp
index 10def0962a0..fc8cbb69227 100644
--- a/TAO/tao/Policy_Current.cpp
+++ b/TAO/tao/Policy_Current.cpp
@@ -20,7 +20,7 @@ TAO_Policy_Current_Impl &
 TAO_Policy_Current::implementation (TAO_Policy_Current_Impl &current)
 {
   TAO_TSS_Resources *tss =
-    TAO_TSS_RESOURCES::instance ();
+    TAO_TSS_Resources::instance ();
 
   TAO_Policy_Current_Impl *old = tss->policy_current_;
   tss->policy_current_ = &current;
@@ -30,7 +30,7 @@ TAO_Policy_Current::implementation (TAO_Policy_Current_Impl &current)
 TAO_Policy_Current_Impl &
 TAO_Policy_Current::implementation (void) const
 {
-  return *TAO_TSS_RESOURCES::instance ()->policy_current_;
+  return *TAO_TSS_Resources::instance ()->policy_current_;
 }
 
 CORBA::Policy_ptr
diff --git a/TAO/tao/Policy_ForwardA.cpp b/TAO/tao/Policy_ForwardA.cpp
deleted file mode 100644
index b764212b911..00000000000
--- a/TAO/tao/Policy_ForwardA.cpp
+++ /dev/null
@@ -1,331 +0,0 @@
-// -*- 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/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "Policy_ForwardC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Enum_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-#include "tao/Any_Basic_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_PolicyType (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/PolicyType:1.0",
-    "PolicyType",
-    &CORBA::_tc_ulong);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_PolicyType =
-    &_tao_tc_CORBA_PolicyType;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-namespace CORBA
-{
-  extern ::CORBA::TypeCode_ptr const _tc_Policy;
-}
-
-
-#ifndef _TAO_TYPECODE_CORBA_PolicyList_GUARD
-#define _TAO_TYPECODE_CORBA_PolicyList_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_PolicyList_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_Policy,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_PolicyList_0 =
-      &CORBA_PolicyList_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_PolicyList_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_PolicyList (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/PolicyList:1.0",
-    "PolicyList",
-    &TAO::TypeCode::tc_CORBA_PolicyList_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_PolicyList =
-    &_tao_tc_CORBA_PolicyList;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_CORBA_PolicyTypeSeq_GUARD
-#define _TAO_TYPECODE_CORBA_PolicyTypeSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_PolicyTypeSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_PolicyType,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_PolicyTypeSeq_0 =
-      &CORBA_PolicyTypeSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_PolicyTypeSeq_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_PolicyTypeSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/PolicyTypeSeq:1.0",
-    "PolicyTypeSeq",
-    &TAO::TypeCode::tc_CORBA_PolicyTypeSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_PolicyTypeSeq =
-    &_tao_tc_CORBA_PolicyTypeSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/enum_typecode.cpp:34
-
-static char const * const _tao_enumerators_CORBA_SetOverrideType[] =
-  {
-    "SET_OVERRIDE",
-    "ADD_OVERRIDE"
-    
-  };
-
-static TAO::TypeCode::Enum<char const *,
-                           char const * const *,
-                           TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_SetOverrideType (
-    "IDL:omg.org/CORBA/SetOverrideType:1.0",
-    "SetOverrideType",
-    _tao_enumerators_CORBA_SetOverrideType,
-    2);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_SetOverrideType =
-    &_tao_tc_CORBA_SetOverrideType;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::PolicyList &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::PolicyList>::insert_copy (
-      _tao_any,
-      CORBA::PolicyList::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_PolicyList_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::PolicyList *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::PolicyList>::insert (
-      _tao_any,
-      CORBA::PolicyList::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_PolicyList_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::PolicyList *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::PolicyList *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::PolicyList *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::PolicyList>::extract (
-        _tao_any,
-        CORBA::PolicyList::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_PolicyList_0,
-        _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::PolicyTypeSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::PolicyTypeSeq>::insert_copy (
-      _tao_any,
-      CORBA::PolicyTypeSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_PolicyTypeSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::PolicyTypeSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::PolicyTypeSeq>::insert (
-      _tao_any,
-      CORBA::PolicyTypeSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_PolicyTypeSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::PolicyTypeSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::PolicyTypeSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::PolicyTypeSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::PolicyTypeSeq>::extract (
-        _tao_any,
-        CORBA::PolicyTypeSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_PolicyTypeSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_cs.cpp:52
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::SetOverrideType _tao_elem
-  )
-{
-  TAO::Any_Basic_Impl_T<CORBA::SetOverrideType>::insert (
-      _tao_any,
-      CORBA::_tc_SetOverrideType,
-      _tao_elem
-    );
-}
-
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::SetOverrideType &_tao_elem
-  )
-{
-  return
-    TAO::Any_Basic_Impl_T<CORBA::SetOverrideType>::extract (
-        _tao_any,
-        CORBA::_tc_SetOverrideType,
-        _tao_elem 
-      );
-}
diff --git a/TAO/tao/Policy_ForwardC.cpp b/TAO/tao/Policy_ForwardC.cpp
index 86eac4a4651..b056d46a8e3 100644
--- a/TAO/tao/Policy_ForwardC.cpp
+++ b/TAO/tao/Policy_ForwardC.cpp
@@ -26,16 +26,12 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
 #include "Policy_ForwardC.h"
 #include "tao/CDR.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
@@ -58,8 +54,8 @@ CORBA::PolicyList::PolicyList (
     CORBA::ULong max
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::Policy,
-        CORBA::Policy_var
+        Policy,
+        Policy_var
       >
     (max)
 {}
@@ -71,8 +67,8 @@ CORBA::PolicyList::PolicyList (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::Policy,
-        CORBA::Policy_var
+        Policy,
+        Policy_var
       >
     (max, length, buffer, release)
 {}
@@ -81,8 +77,8 @@ CORBA::PolicyList::PolicyList (
     const PolicyList &seq
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::Policy,
-        CORBA::Policy_var
+        Policy,
+        Policy_var
       >
     (seq)
 {}
@@ -114,7 +110,7 @@ CORBA::PolicyTypeSeq::PolicyTypeSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Sequence<
-        CORBA::PolicyType
+        PolicyType
       >
     (max)
 {}
@@ -126,7 +122,7 @@ CORBA::PolicyTypeSeq::PolicyTypeSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Sequence<
-        CORBA::PolicyType
+        PolicyType
       >
     (max, length, buffer, release)
 {}
@@ -135,7 +131,7 @@ CORBA::PolicyTypeSeq::PolicyTypeSeq (
     const PolicyTypeSeq &seq
   )
   : TAO_Unbounded_Sequence<
-        CORBA::PolicyType
+        PolicyType
       >
     (seq)
 {}
diff --git a/TAO/tao/Policy_ForwardC.h b/TAO/tao/Policy_ForwardC.h
index 385cd6f768b..9d15b8a3cf2 100644
--- a/TAO/tao/Policy_ForwardC.h
+++ b/TAO/tao/Policy_ForwardC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_POLICY_FORWARDC_H_
-#define _TAO_IDL_ORIG_POLICY_FORWARDC_H_
+#ifndef _TAO_IDL_POLICY_FORWARDC_H_
+#define _TAO_IDL_POLICY_FORWARDC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -41,6 +41,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/TAO_Export.h"
+#include "tao/ORB.h"
 #include "tao/Environment.h"
 #include "tao/Sequence_T.h"
 #include "tao/Objref_VarOut_T.h"
@@ -52,17 +53,8 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#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
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace CORBA
 {
@@ -74,11 +66,6 @@ namespace CORBA
   typedef CORBA::ULong_out PolicyType_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_PolicyType;
-  
-  // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_POLICY__VAR_OUT_CH_)
@@ -157,11 +144,6 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_PolicyList;
-  
-  // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_POLICYTYPESEQ_CH_)
@@ -210,11 +192,6 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_PolicyTypeSeq;
-  
-  // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_POLICYCURRENT__VAR_OUT_CH_)
@@ -247,14 +224,9 @@ namespace CORBA
   };
   
   typedef SetOverrideType &SetOverrideType_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_SetOverrideType;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module CORBA
 
@@ -265,8 +237,8 @@ namespace CORBA
 namespace TAO
 {
 
-#if !defined (_CORBA_POLICY__TRAITS_CH_)
-#define _CORBA_POLICY__TRAITS_CH_
+#if !defined (_CORBA_POLICY__TRAITS_)
+#define _CORBA_POLICY__TRAITS_
   
   template<>
   struct TAO_Export Objref_Traits< ::CORBA::Policy>
@@ -286,8 +258,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_POLICYCURRENT__TRAITS_CH_)
-#define _CORBA_POLICYCURRENT__TRAITS_CH_
+#if !defined (_CORBA_POLICYCURRENT__TRAITS_)
+#define _CORBA_POLICYCURRENT__TRAITS_
   
   template<>
   struct TAO_Export Objref_Traits< ::CORBA::PolicyCurrent>
@@ -309,35 +281,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/any_op_ch.cpp:63
-
-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
-// 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
-// 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
-// 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
 // be\be_visitor_interface_fwd/cdr_op_ch.cpp:66
 
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::Policy_ptr );
@@ -385,15 +328,7 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, CORBA::SetOverrideType);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::SetOverrideType &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+// be\be_codegen.cpp:1028
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PortableInterceptor.pidl b/TAO/tao/PortableInterceptor.pidl
index 90eee47b8f5..00e1a22675c 100644
--- a/TAO/tao/PortableInterceptor.pidl
+++ b/TAO/tao/PortableInterceptor.pidl
@@ -37,9 +37,6 @@
 #include <PI_Forward.pidl>
 #include <Messaging_SyncScope.pidl>
 
-#include <InvalidSlot.pidl>
-#include <PICurrent.pidl>
-
 module PortableInterceptor {
 
   typeprefix PortableInterceptor "omg.org";
diff --git a/TAO/tao/PortableInterceptorC.cpp b/TAO/tao/PortableInterceptorC.cpp
index f2232e01981..25d2f8334ff 100644
--- a/TAO/tao/PortableInterceptorC.cpp
+++ b/TAO/tao/PortableInterceptorC.cpp
@@ -26,19 +26,11 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
 #include "PortableInterceptorC.h"
 #include "tao/CDR.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
diff --git a/TAO/tao/PortableInterceptorC.h b/TAO/tao/PortableInterceptorC.h
index cd207a3911f..bf1b51c4d81 100644
--- a/TAO/tao/PortableInterceptorC.h
+++ b/TAO/tao/PortableInterceptorC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_PORTABLEINTERCEPTORC_H_
-#define _TAO_IDL_ORIG_PORTABLEINTERCEPTORC_H_
+#ifndef _TAO_IDL_PORTABLEINTERCEPTORC_H_
+#define _TAO_IDL_PORTABLEINTERCEPTORC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -42,91 +42,79 @@
 
 #include "tao/TAO_Export.h"
 #include "tao/ORB.h"
-#include "tao/SystemException.h"
 #include "tao/Environment.h"
 
 #include "tao/PI_ForwardC.h"
 #include "tao/Messaging_SyncScopeC.h"
-#include "tao/InvalidSlotC.h"
-#include "tao/PICurrentC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
 #define TAO_EXPORT_MACRO TAO_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#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
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace PortableInterceptor
 {
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const PortableInterceptor::AdapterState HOLDING = 0;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const PortableInterceptor::AdapterState ACTIVE = 1;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const PortableInterceptor::AdapterState DISCARDING = 2;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const PortableInterceptor::AdapterState INACTIVE = 3;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const PortableInterceptor::AdapterState NON_EXISTENT = 4;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const PortableInterceptor::ReplyStatus SUCCESSFUL = 0;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const PortableInterceptor::ReplyStatus SYSTEM_EXCEPTION = 1;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const PortableInterceptor::ReplyStatus USER_EXCEPTION = 2;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const PortableInterceptor::ReplyStatus LOCATION_FORWARD = 3;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const PortableInterceptor::ReplyStatus TRANSPORT_RETRY = 4;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const PortableInterceptor::ReplyStatus UNKNOWN = 5;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module PortableInterceptor
 
@@ -139,15 +127,7 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+// be\be_codegen.cpp:1028
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PortableServer.mpc b/TAO/tao/PortableServer.mpc
index a839d48bc48..add4704f0a3 100644
--- a/TAO/tao/PortableServer.mpc
+++ b/TAO/tao/PortableServer.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project : taolib, core {
+project : taolib, core, anytypecode {
   sharedname   = TAO_PortableServer
   dynamicflags = TAO_PORTABLESERVER_BUILD_DLL
 
@@ -27,6 +27,10 @@ project : taolib, core {
     PortableServer
   }
 
+  IDL_Files {
+    PortableServer
+  }
+
   Pkgconfig_Files {
     PortableServer/TAO_PortableServer.pc.in
   }
diff --git a/TAO/tao/PortableServer/AdapterActivatorA.cpp b/TAO/tao/PortableServer/AdapterActivatorA.cpp
index 2b071bd18ca..919f249a06a 100644
--- a/TAO/tao/PortableServer/AdapterActivatorA.cpp
+++ b/TAO/tao/PortableServer/AdapterActivatorA.cpp
@@ -25,15 +25,15 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "AdapterActivatorC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
+#include "AdapterActivatorA.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
@@ -46,88 +46,11 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/PortableServer/AdapterActivator:2.3",
     "AdapterActivator");
-  
+
 namespace PortableServer
 {
   ::CORBA::TypeCode_ptr const _tc_AdapterActivator =
     &_tao_tc_PortableServer_AdapterActivator;
 }
 
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::AdapterActivator>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::AdapterActivator>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::AdapterActivator>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// 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
-      );
-}
-
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/AdapterActivatorA.h b/TAO/tao/PortableServer/AdapterActivatorA.h
new file mode 100644
index 00000000000..b67fd60fcae
--- /dev/null
+++ b/TAO/tao/PortableServer/AdapterActivatorA.h
@@ -0,0 +1,59 @@
+// -*- 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/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:754
+
+#ifndef _TAO_IDL_ADAPTERACTIVATORA_H_
+#define _TAO_IDL_ADAPTERACTIVATORA_H_
+
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+#include "AdapterActivatorC.h"
+#include "tao/PortableServer/PS_ForwardA.h"
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:59
+
+namespace PortableServer
+{
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
+  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_AdapterActivator;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:86
+
+} // module PortableServer
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
diff --git a/TAO/tao/PortableServer/AdapterActivatorC.cpp b/TAO/tao/PortableServer/AdapterActivatorC.cpp
index 9e68f0c7308..14a2fbb7712 100644
--- a/TAO/tao/PortableServer/AdapterActivatorC.cpp
+++ b/TAO/tao/PortableServer/AdapterActivatorC.cpp
@@ -26,17 +26,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
 #include "AdapterActivatorC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
@@ -90,14 +86,6 @@ PortableServer::AdapterActivator::AdapterActivator (void)
 PortableServer::AdapterActivator::~AdapterActivator (void)
 {}
 
-void 
-PortableServer::AdapterActivator::_tao_any_destructor (void *_tao_void_pointer)
-{
-  AdapterActivator *_tao_tmp_pointer =
-    static_cast<AdapterActivator *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
 PortableServer::AdapterActivator_ptr
 PortableServer::AdapterActivator::_narrow (
     CORBA::Object_ptr _tao_objref
diff --git a/TAO/tao/PortableServer/AdapterActivatorC.h b/TAO/tao/PortableServer/AdapterActivatorC.h
index 8eb1558e581..f2f020051a9 100644
--- a/TAO/tao/PortableServer/AdapterActivatorC.h
+++ b/TAO/tao/PortableServer/AdapterActivatorC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_ADAPTERACTIVATORC_H_
-#define _TAO_IDL_ORIG_ADAPTERACTIVATORC_H_
+#ifndef _TAO_IDL_ADAPTERACTIVATORC_H_
+#define _TAO_IDL_ADAPTERACTIVATORC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -54,17 +54,8 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PortableServer_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#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
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
@@ -126,7 +117,7 @@ namespace PortableServer
       return static_cast<AdapterActivator_ptr> (0);
     }
     
-    static void _tao_any_destructor (void *);
+    
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -165,14 +156,9 @@ namespace PortableServer
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_AdapterActivator;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module PortableServer
 
@@ -183,8 +169,8 @@ namespace PortableServer
 namespace TAO
 {
 
-#if !defined (_PORTABLESERVER_ADAPTERACTIVATOR__TRAITS_CH_)
-#define _PORTABLESERVER_ADAPTERACTIVATOR__TRAITS_CH_
+#if !defined (_PORTABLESERVER_ADAPTERACTIVATOR__TRAITS_)
+#define _PORTABLESERVER_ADAPTERACTIVATOR__TRAITS_
   
   template<>
   struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::AdapterActivator>
@@ -205,25 +191,10 @@ namespace TAO
 #endif /* end #if !defined */
 }
 
-// TAO_IDL - Generated from
-// 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 &);
-
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+// be\be_codegen.cpp:1028
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PortableServer/Any_SArg_Traits.h b/TAO/tao/PortableServer/Any_SArg_Traits.h
index 1b672c8e571..abb88199417 100644
--- a/TAO/tao/PortableServer/Any_SArg_Traits.h
+++ b/TAO/tao/PortableServer/Any_SArg_Traits.h
@@ -39,7 +39,8 @@ namespace TAO
         Var_Size_SArg_Traits_T<
             CORBA::Any,
             CORBA::Any_var,
-            CORBA::Any_out
+            CORBA::Any_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::Any>
           >
   {
   };
diff --git a/TAO/tao/PortableServer/BD_String_SArgument_T.cpp b/TAO/tao/PortableServer/BD_String_SArgument_T.cpp
index ad2cabfd5d8..1b9ae8f7adf 100644
--- a/TAO/tao/PortableServer/BD_String_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/BD_String_SArgument_T.cpp
@@ -4,7 +4,6 @@
 #define TAO_BD_STRING_SARGUMENT_T_CPP
 
 #include "tao/PortableServer/BD_String_SArgument_T.h"
-#include "tao/Dynamic_ParameterC.h"
 
 #if !defined (__ACE_INLINE__)
 #include "tao/PortableServer/BD_String_SArgument_T.inl"
@@ -15,9 +14,10 @@ template<typename S,
          typename S_var,
          typename to_S,
          typename from_S,
-         size_t BOUND>
+         size_t BOUND,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::In_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND>::demarshal (
+TAO::In_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND,Insert_Policy>::demarshal (
     TAO_InputCDR & cdr
   )
 {
@@ -30,14 +30,13 @@ template<typename S,
          typename S_var,
          typename to_S,
          typename from_S,
-         size_t BOUND>
+         size_t BOUND,
+         typename Insert_Policy>
 void
-TAO::In_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::In_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND,Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  p.argument <<= from_S (this->x_.in (), BOUND);
-  p.mode = CORBA::PARAM_IN;
+  this->Insert_Policy::any_insert (any, from_S (this->x_.in (), BOUND));
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -48,9 +47,10 @@ template<typename S,
          typename S_var,
          typename to_S,
          typename from_S,
-         size_t BOUND>
+         size_t BOUND,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND>::marshal (
+TAO::Inout_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND,Insert_Policy>::marshal (
     TAO_OutputCDR & cdr
   )
 {
@@ -61,9 +61,10 @@ template<typename S,
          typename S_var,
          typename to_S,
          typename from_S,
-         size_t BOUND>
+         size_t BOUND,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND>::demarshal (
+TAO::Inout_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND,Insert_Policy>::demarshal (
     TAO_InputCDR & cdr
   )
 {
@@ -76,13 +77,13 @@ template<typename S,
          typename S_var,
          typename to_S,
          typename from_S,
-         size_t BOUND>
+         size_t BOUND,
+         typename Insert_Policy>
 void
-TAO::Inout_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND>::
-interceptor_param (Dynamic::Parameter & p)
+TAO::Inout_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND,Insert_Policy>::
+interceptor_value (CORBA::Any *any) const
 {
-  p.argument <<= from_S (this->x_.in (), BOUND);
-  p.mode = CORBA::PARAM_INOUT;
+  this->Insert_Policy::any_insert (any, from_S (this->x_.in (), BOUND));
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -94,9 +95,10 @@ template<typename S,
          typename S_out,
          typename to_S,
          typename from_S,
-         size_t BOUND>
+         size_t BOUND,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Out_BD_String_SArgument_T<S,S_var,S_out,to_S,from_S,BOUND>::marshal (
+TAO::Out_BD_String_SArgument_T<S,S_var,S_out,to_S,from_S,BOUND,Insert_Policy>::marshal (
     TAO_OutputCDR &cdr
   )
 {
@@ -110,13 +112,13 @@ template<typename S,
          typename S_out,
          typename to_S,
          typename from_S,
-         size_t BOUND>
+         size_t BOUND,
+         typename Insert_Policy>
 void
-TAO::Out_BD_String_SArgument_T<S,S_var,S_out,to_S,from_S,BOUND>::
-interceptor_param (Dynamic::Parameter & p)
+TAO::Out_BD_String_SArgument_T<S,S_var,S_out,to_S,from_S,BOUND,Insert_Policy>::
+interceptor_value (CORBA::Any *any) const
 {
-  p.argument <<= from_S (this->x_.in (), BOUND);
-  p.mode = CORBA::PARAM_OUT;
+  this->Insert_Policy::any_insert (any, from_S (this->x_.in (), BOUND));
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -127,9 +129,10 @@ template<typename S,
          typename S_var,
          typename to_S,
          typename from_S,
-         size_t BOUND>
+         size_t BOUND,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Ret_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND>::marshal (
+TAO::Ret_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND,Insert_Policy>::marshal (
     TAO_OutputCDR & cdr
   )
 {
@@ -142,12 +145,13 @@ template<typename S,
          typename S_var,
          typename to_S,
          typename from_S,
-         size_t BOUND>
+         size_t BOUND,
+         typename Insert_Policy>
 void
-TAO::Ret_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND>::
-interceptor_result (CORBA::Any * any)
+TAO::Ret_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND,Insert_Policy>::
+interceptor_value (CORBA::Any *any) const
 {
-  (*any) <<= from_S (this->x_.in (), BOUND);
+  this->Insert_Policy::any_insert (any, from_S (this->x_.in (), BOUND));
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
diff --git a/TAO/tao/PortableServer/BD_String_SArgument_T.h b/TAO/tao/PortableServer/BD_String_SArgument_T.h
index 4ad82f430bc..e4cd49d1ab6 100644
--- a/TAO/tao/PortableServer/BD_String_SArgument_T.h
+++ b/TAO/tao/PortableServer/BD_String_SArgument_T.h
@@ -23,6 +23,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/Argument.h"
+#include "tao/Any_Insert_Policy_T.h"
 
 namespace TAO
 {
@@ -36,15 +37,16 @@ namespace TAO
            typename S_var,
            typename to_S,
            typename from_S,
-           size_t BOUND>
-  class In_BD_String_SArgument_T : public Argument
+           size_t BOUND,
+           typename Insert_Policy>
+  class In_BD_String_SArgument_T : public InArgument, private Insert_Policy
   {
   public:
     In_BD_String_SArgument_T (void);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     const S * arg (void) const;
 
@@ -62,16 +64,17 @@ namespace TAO
            typename S_var,
            typename to_S,
            typename from_S,
-           size_t BOUND>
-  class Inout_BD_String_SArgument_T : public Argument
+           size_t BOUND,
+           typename Insert_Policy>
+  class Inout_BD_String_SArgument_T : public InoutArgument, private Insert_Policy
   {
   public:
     Inout_BD_String_SArgument_T (void);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S *& arg (void);
 
@@ -90,15 +93,16 @@ namespace TAO
            typename S_out,
            typename to_S,
            typename from_S,
-           size_t BOUND>
-  class Out_BD_String_SArgument_T : public Argument
+           size_t BOUND,
+           typename Insert_Policy>
+  class Out_BD_String_SArgument_T : public OutArgument, private Insert_Policy
   {
   public:
     Out_BD_String_SArgument_T (void);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S *& arg (void);
 
@@ -116,15 +120,16 @@ namespace TAO
            typename S_var,
            typename to_S,
            typename from_S,
-           size_t BOUND>
-  class Ret_BD_String_SArgument_T : public Argument
+           size_t BOUND,
+           typename Insert_Policy>
+  class Ret_BD_String_SArgument_T : public RetArgument, private Insert_Policy
   {
   public:
     Ret_BD_String_SArgument_T (void);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_result (CORBA::Any *);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S *& arg (void);
 
@@ -143,7 +148,8 @@ namespace TAO
            typename T_out,
            typename to_T,
            typename from_T,
-           size_t BOUND>
+           size_t BOUND,
+           typename Insert_Policy>
   struct BD_String_SArg_Traits_T
   {
     typedef T *                                   ret_type;
@@ -155,23 +161,27 @@ namespace TAO
                                      T_var,
                                      to_T,
                                      from_T,
-                                     BOUND>       in_arg_val;
+                                     BOUND,
+                                     Insert_Policy>       in_arg_val;
     typedef Inout_BD_String_SArgument_T<T,
                                         T_var,
                                         to_T,
                                         from_T,
-                                        BOUND>    inout_arg_val;
+                                        BOUND,
+                                        Insert_Policy>    inout_arg_val;
     typedef Out_BD_String_SArgument_T<T,
                                       T_var,
                                       T_out,
                                       to_T,
                                       from_T,
-                                      BOUND>      out_arg_val;
+                                      BOUND,
+                                      Insert_Policy>      out_arg_val;
     typedef Ret_BD_String_SArgument_T<T,
                                       T_var,
                                       to_T,
                                       from_T,
-                                      BOUND>      ret_val;
+                                      BOUND,
+                                      Insert_Policy>      ret_val;
 
     // Typedefs corresponding to return value of arg() method in both
     // the client and server side argument class templates.
@@ -181,34 +191,6 @@ namespace TAO
     typedef inout_type                            ret_arg_type;
 
   };
-
-  /**
-   *
-   * @brief Specializations for bounded (w)strings
-   *
-   */
-
-  template<size_t BOUND>
-  class BD_String_SArg_Traits
-    : public BD_String_SArg_Traits_T<CORBA::Char,
-                                     CORBA::String_var,
-                                     CORBA::String_out,
-                                     ACE_InputCDR::to_string,
-                                     ACE_OutputCDR::from_string,
-                                     BOUND>
-  {
-  };
-
-  template<size_t BOUND>
-  class BD_WString_SArg_Traits
-    : public BD_String_SArg_Traits_T<CORBA::WChar,
-                                     CORBA::WString_var,
-                                     CORBA::WString_out,
-                                     ACE_InputCDR::to_wstring,
-                                     ACE_OutputCDR::from_wstring,
-                                     BOUND>
-  {
-  };
 }
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/PortableServer/BD_String_SArgument_T.inl b/TAO/tao/PortableServer/BD_String_SArgument_T.inl
index f8a76b8938f..c8727fb3d32 100644
--- a/TAO/tao/PortableServer/BD_String_SArgument_T.inl
+++ b/TAO/tao/PortableServer/BD_String_SArgument_T.inl
@@ -1,97 +1,109 @@
 // $Id$
 
-template<typename S, 
-         typename S_var, 
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
+template<typename S,
+         typename S_var,
+         typename to_S,
+         typename from_S,
+         size_t BOUND,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::In_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND>::
+TAO::In_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND,Insert_Policy>::
 In_BD_String_SArgument_T (void)
 {}
 
-template<typename S, 
-         typename S_var, 
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
+template<typename S,
+         typename S_var,
+         typename to_S,
+         typename from_S,
+         size_t BOUND,
+         typename Insert_Policy>
 ACE_INLINE
 const S *
-TAO::In_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND>::arg (void) const
+TAO::In_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND,Insert_Policy>::
+arg (void) const
 {
   return this->x_.in ();
 }
 
 // ==========================================================================
 
-template<typename S, 
-         typename S_var, 
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
+template<typename S,
+         typename S_var,
+         typename to_S,
+         typename from_S,
+         size_t BOUND,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Inout_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND>::
+TAO::Inout_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND,Insert_Policy>::
 Inout_BD_String_SArgument_T (void)
 {}
 
-template<typename S, 
-         typename S_var, 
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
+template<typename S,
+         typename S_var,
+         typename to_S,
+         typename from_S,
+         size_t BOUND,
+         typename Insert_Policy>
 ACE_INLINE
 S *&
-TAO::Inout_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND>::arg (void)
+TAO::Inout_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND,Insert_Policy>::
+arg (void)
 {
   return this->x_.inout ();
 }
 
 // ==========================================================================
 
-template<typename S, 
+template<typename S,
          typename S_var,
          typename S_out,
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
+         typename to_S,
+         typename from_S,
+         size_t BOUND,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Out_BD_String_SArgument_T<S,S_var,S_out,to_S,from_S,BOUND>::
+TAO::Out_BD_String_SArgument_T<S,S_var,S_out,to_S,from_S,BOUND,Insert_Policy>::
 Out_BD_String_SArgument_T (void)
 {}
 
-template<typename S, 
-         typename S_var, 
+template<typename S,
+         typename S_var,
          typename S_out,
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
+         typename to_S,
+         typename from_S,
+         size_t BOUND,
+         typename Insert_Policy>
 ACE_INLINE
 S *&
-TAO::Out_BD_String_SArgument_T<S,S_var,S_out,to_S,from_S,BOUND>::arg (void)
+TAO::Out_BD_String_SArgument_T<S,S_var,S_out,to_S,from_S,BOUND,Insert_Policy>::
+arg (void)
 {
   return this->x_.out ();
 }
 
 // ==========================================================================
 
-template<typename S, 
-         typename S_var, 
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
+template<typename S,
+         typename S_var,
+         typename to_S,
+         typename from_S,
+         size_t BOUND,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Ret_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND>::
+TAO::Ret_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND,Insert_Policy>::
 Ret_BD_String_SArgument_T (void)
 {}
 
-template<typename S, 
-         typename S_var, 
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
+template<typename S,
+         typename S_var,
+         typename to_S,
+         typename from_S,
+         size_t BOUND,
+         typename Insert_Policy>
 ACE_INLINE
 S *&
-TAO::Ret_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND>::arg (void)
+TAO::Ret_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND,Insert_Policy>::
+arg (void)
 {
   return this->x_.out ();
 }
diff --git a/TAO/tao/PortableServer/Basic_SArgument_T.cpp b/TAO/tao/PortableServer/Basic_SArgument_T.cpp
index 79301cfb9aa..a6fe3ead5f4 100644
--- a/TAO/tao/PortableServer/Basic_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Basic_SArgument_T.cpp
@@ -4,97 +4,93 @@
 #define TAO_BASIC_SARGUMENT_T_CPP
 
 #include "tao/PortableServer/Basic_SArgument_T.h"
-#include "tao/Dynamic_ParameterC.h"
 
 #if !defined (__ACE_INLINE__)
 #include "tao/PortableServer/Basic_SArgument_T.inl"
 #endif /* __ACE_INLINE__ */
 
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 CORBA::Boolean
-TAO::In_Basic_SArgument_T<S>::demarshal (TAO_InputCDR &cdr)
+TAO::In_Basic_SArgument_T<S,Insert_Policy>::demarshal (TAO_InputCDR &cdr)
 {
   return cdr >> this->x_;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 void
-TAO::In_Basic_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p)
+TAO::In_Basic_SArgument_T<S,Insert_Policy>::interceptor_value (CORBA::Any *any) const
 {
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_IN;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ===========================================================
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_Basic_SArgument_T<S>::marshal (TAO_OutputCDR & cdr)
+TAO::Inout_Basic_SArgument_T<S,Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << this->x_;
 }
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_Basic_SArgument_T<S>::demarshal (TAO_InputCDR & cdr)
+TAO::Inout_Basic_SArgument_T<S,Insert_Policy>::demarshal (TAO_InputCDR & cdr)
 {
   return cdr >> this->x_;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 void
-TAO::Inout_Basic_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p)
+TAO::Inout_Basic_SArgument_T<S,Insert_Policy>::interceptor_value (CORBA::Any *any) const
 {
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_INOUT;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ==============================================================
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 CORBA::Boolean
-TAO::Out_Basic_SArgument_T<S>::marshal (TAO_OutputCDR &cdr)
+TAO::Out_Basic_SArgument_T<S,Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << this->x_;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 void
-TAO::Out_Basic_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p)
+TAO::Out_Basic_SArgument_T<S,Insert_Policy>::interceptor_value (CORBA::Any *any) const
 {
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_OUT;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ============================================================
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 CORBA::Boolean
-TAO::Ret_Basic_SArgument_T<S>::marshal (TAO_OutputCDR & cdr)
+TAO::Ret_Basic_SArgument_T<S,Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << this->x_;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 void
-TAO::Ret_Basic_SArgument_T<S>::interceptor_result (CORBA::Any * any)
+TAO::Ret_Basic_SArgument_T<S,Insert_Policy>::interceptor_value (CORBA::Any *any) const
 {
-  (*any) <<= this->x_;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
diff --git a/TAO/tao/PortableServer/Basic_SArgument_T.h b/TAO/tao/PortableServer/Basic_SArgument_T.h
index 4c0518a9674..33297cb7adf 100644
--- a/TAO/tao/PortableServer/Basic_SArgument_T.h
+++ b/TAO/tao/PortableServer/Basic_SArgument_T.h
@@ -30,15 +30,15 @@ namespace TAO
    * @brief Template class for IN skeleton argument of basic IDL types.
    *
    */
-  template<typename S>
-  class In_Basic_SArgument_T : public Argument
+  template<typename S, typename Insert_Policy>
+  class In_Basic_SArgument_T : public InArgument, private Insert_Policy
   {
   public:
     In_Basic_SArgument_T (void);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S arg (void) const;
 
@@ -52,16 +52,16 @@ namespace TAO
    * @brief Template class for INOUT skeleton argument of basic IDL types.
    *
    */
-  template<typename S>
-  class Inout_Basic_SArgument_T : public Argument
+  template<typename S, typename Insert_Policy>
+  class Inout_Basic_SArgument_T : public InoutArgument, private Insert_Policy
   {
   public:
     Inout_Basic_SArgument_T (void);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S & arg (void);
 
@@ -75,15 +75,15 @@ namespace TAO
    * @brief Template class for OUT skeleton argument of basic IDL types.
    *
    */
-  template<typename S>
-  class Out_Basic_SArgument_T : public Argument
+  template<typename S, typename Insert_Policy>
+  class Out_Basic_SArgument_T : public OutArgument, private Insert_Policy
   {
   public:
     Out_Basic_SArgument_T (void);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S & arg (void);
 
@@ -97,15 +97,15 @@ namespace TAO
    * @brief Template class for return skeleton value of basic IDL types.
    *
    */
-  template<typename S>
-  class Ret_Basic_SArgument_T : public Argument
+  template<typename S, typename Insert_Policy>
+  class Ret_Basic_SArgument_T : public RetArgument, private Insert_Policy
   {
   public:
     Ret_Basic_SArgument_T (void);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_result (CORBA::Any *);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S & arg (void);
 
@@ -119,7 +119,7 @@ namespace TAO
    * @brief Template class for skeleton argument traits of basic IDL types.
    *
    */
-  template<typename T>
+  template<typename T, typename Insert_Policy>
   struct Basic_SArg_Traits_T
   {
     typedef T                           ret_type;
@@ -127,10 +127,10 @@ namespace TAO
     typedef T &                         inout_type;
     typedef T &                         out_type;
 
-    typedef In_Basic_SArgument_T<T>     in_arg_val;
-    typedef Inout_Basic_SArgument_T<T>  inout_arg_val;
-    typedef Out_Basic_SArgument_T<T>    out_arg_val;
-    typedef Ret_Basic_SArgument_T<T>    ret_val;
+    typedef In_Basic_SArgument_T<T, Insert_Policy>     in_arg_val;
+    typedef Inout_Basic_SArgument_T<T, Insert_Policy>  inout_arg_val;
+    typedef Out_Basic_SArgument_T<T, Insert_Policy>    out_arg_val;
+    typedef Ret_Basic_SArgument_T<T, Insert_Policy>    ret_val;
 
     // Typedefs corresponding to return value of arg() method in both
     // the client and server side argument class templates.
diff --git a/TAO/tao/PortableServer/Basic_SArgument_T.inl b/TAO/tao/PortableServer/Basic_SArgument_T.inl
index 2bbaba955ab..195d7bca229 100644
--- a/TAO/tao/PortableServer/Basic_SArgument_T.inl
+++ b/TAO/tao/PortableServer/Basic_SArgument_T.inl
@@ -2,60 +2,60 @@
 //
 // $Id$
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 ACE_INLINE
-TAO::In_Basic_SArgument_T<S>::In_Basic_SArgument_T (void)
+TAO::In_Basic_SArgument_T<S,Insert_Policy>::In_Basic_SArgument_T (void)
 {}
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 ACE_INLINE
 S
-TAO::In_Basic_SArgument_T<S>::arg (void) const
+TAO::In_Basic_SArgument_T<S,Insert_Policy>::arg (void) const
 {
   return this->x_;
 }
 
 // ================================================================
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 ACE_INLINE
-TAO::Inout_Basic_SArgument_T<S>::Inout_Basic_SArgument_T (void)
+TAO::Inout_Basic_SArgument_T<S,Insert_Policy>::Inout_Basic_SArgument_T (void)
 {}
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 ACE_INLINE
 S &
-TAO::Inout_Basic_SArgument_T<S>::arg (void)
+TAO::Inout_Basic_SArgument_T<S,Insert_Policy>::arg (void)
 {
   return this->x_;
 }
 
 // ================================================================
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 ACE_INLINE
-TAO::Out_Basic_SArgument_T<S>::Out_Basic_SArgument_T (void)
+TAO::Out_Basic_SArgument_T<S,Insert_Policy>::Out_Basic_SArgument_T (void)
 {}
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 ACE_INLINE
 S &
-TAO::Out_Basic_SArgument_T<S>::arg (void)
+TAO::Out_Basic_SArgument_T<S,Insert_Policy>::arg (void)
 {
   return this->x_;
 }
 
 // ================================================================
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 ACE_INLINE
-TAO::Ret_Basic_SArgument_T<S>::Ret_Basic_SArgument_T (void)
+TAO::Ret_Basic_SArgument_T<S,Insert_Policy>::Ret_Basic_SArgument_T (void)
 {}
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 ACE_INLINE
 S &
-TAO::Ret_Basic_SArgument_T<S>::arg (void)
+TAO::Ret_Basic_SArgument_T<S,Insert_Policy>::arg (void)
 {
   return this->x_;
 }
diff --git a/TAO/tao/PortableServer/Basic_SArguments.h b/TAO/tao/PortableServer/Basic_SArguments.h
index a61a5dc68b6..933476cb806 100644
--- a/TAO/tao/PortableServer/Basic_SArguments.h
+++ b/TAO/tao/PortableServer/Basic_SArguments.h
@@ -23,7 +23,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/PortableServer/Basic_SArgument_T.h"
-#include "tao/Arg_Traits_T.h"
+#include "tao/PortableServer/SArg_Traits_T.h"
 
 
 namespace TAO
@@ -39,7 +39,7 @@ namespace TAO
   public:
 
     typedef void        ret_type;
-    typedef Argument    ret_val;
+    typedef RetArgument ret_val;
 
   };
 
@@ -52,55 +52,55 @@ namespace TAO
 
   template<>
   class TAO_PortableServer_Export SArg_Traits<CORBA::Short>
-    : public Basic_SArg_Traits_T<CORBA::Short>
+    : public Basic_SArg_Traits_T<CORBA::Short, TAO::Any_Insert_Policy_Stream <CORBA::Short> >
   {
   };
 
   template<>
   class TAO_PortableServer_Export SArg_Traits<CORBA::Long>
-    : public Basic_SArg_Traits_T<CORBA::Long>
+    : public Basic_SArg_Traits_T<CORBA::Long, TAO::Any_Insert_Policy_Stream <CORBA::Long> >
   {
   };
 
   template<>
   class TAO_PortableServer_Export SArg_Traits<CORBA::UShort>
-    : public Basic_SArg_Traits_T<CORBA::UShort>
+    : public Basic_SArg_Traits_T<CORBA::UShort, TAO::Any_Insert_Policy_Stream <CORBA::UShort> >
   {
   };
 
   template<>
   class TAO_PortableServer_Export SArg_Traits<CORBA::ULong>
-    : public Basic_SArg_Traits_T<CORBA::ULong>
+    : public Basic_SArg_Traits_T<CORBA::ULong, TAO::Any_Insert_Policy_Stream <CORBA::ULong> >
   {
   };
 
   template<>
   class TAO_PortableServer_Export SArg_Traits<CORBA::Float>
-    : public Basic_SArg_Traits_T<CORBA::Float>
+    : public Basic_SArg_Traits_T<CORBA::Float, TAO::Any_Insert_Policy_Stream <CORBA::Float> >
   {
   };
 
   template<>
   class TAO_PortableServer_Export SArg_Traits<CORBA::Double>
-    : public Basic_SArg_Traits_T<CORBA::Double>
+    : public Basic_SArg_Traits_T<CORBA::Double, TAO::Any_Insert_Policy_Stream <CORBA::Double> >
   {
   };
 
   template<>
   class TAO_PortableServer_Export SArg_Traits<CORBA::LongLong>
-    : public Basic_SArg_Traits_T<CORBA::LongLong>
+    : public Basic_SArg_Traits_T<CORBA::LongLong, TAO::Any_Insert_Policy_Stream <CORBA::LongLong> >
   {
   };
 
   template<>
   class TAO_PortableServer_Export SArg_Traits<CORBA::ULongLong>
-    : public Basic_SArg_Traits_T<CORBA::ULongLong>
+    : public Basic_SArg_Traits_T<CORBA::ULongLong, TAO::Any_Insert_Policy_Stream <CORBA::ULongLong> >
   {
   };
 
   template<>
   class TAO_PortableServer_Export SArg_Traits<CORBA::LongDouble>
-    : public Basic_SArg_Traits_T<CORBA::LongDouble>
+    : public Basic_SArg_Traits_T<CORBA::LongDouble, TAO::Any_Insert_Policy_Stream <CORBA::LongDouble> >
   {
   };
 
diff --git a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp
index 424e0a8f5b4..1d90e7de4bc 100644
--- a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp
@@ -4,18 +4,20 @@
 #define TAO_FIXED_ARRAY_SARGUMENT_T_CPP
 
 #include "tao/PortableServer/Fixed_Array_SArgument_T.h"
-#include "tao/Dynamic_ParameterC.h"
 
 #if !defined (__ACE_INLINE__)
 #include "tao/PortableServer/Fixed_Array_SArgument_T.inl"
 #endif /* __ACE_INLINE__ */
 
-
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 CORBA::Boolean
 TAO::In_Fixed_Array_SArgument_T<S,
                                 S_slice,
-                                S_forany>::demarshal (TAO_InputCDR &cdr)
+                                S_forany,
+                                Insert_Policy>::demarshal (TAO_InputCDR &cdr)
 {
   S_forany tmp (this->x_);
   return cdr >> tmp;
@@ -23,36 +25,47 @@ TAO::In_Fixed_Array_SArgument_T<S,
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 void
 TAO::In_Fixed_Array_SArgument_T<S,
                                 S_slice,
-                                S_forany>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+                                S_forany,
+                                Insert_Policy>::interceptor_value (
+    CORBA::Any *any) const
 {
-  p.argument <<= S_forany (this->x_);
-  p.mode = CORBA::PARAM_IN;
+  this->Insert_Policy::any_insert (any, S_forany (this->x_));
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ===========================================================
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 CORBA::Boolean
 TAO::Inout_Fixed_Array_SArgument_T<S,
                                    S_slice,
-                                   S_forany>::marshal (TAO_OutputCDR & cdr)
+                                   S_forany,
+                                   Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << S_forany (this->x_);
 }
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 CORBA::Boolean
 TAO::Inout_Fixed_Array_SArgument_T<S,
                                    S_slice,
-                                   S_forany>::demarshal (TAO_InputCDR & cdr)
+                                   S_forany,
+                                   Insert_Policy>::
+demarshal (TAO_InputCDR & cdr)
 {
   S_forany tmp (this->x_);
   return cdr >> tmp;
@@ -60,51 +73,66 @@ TAO::Inout_Fixed_Array_SArgument_T<S,
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 void
 TAO::Inout_Fixed_Array_SArgument_T<S,
                                    S_slice,
-                                   S_forany>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+                                   S_forany,
+                                   Insert_Policy>::interceptor_value (
+    CORBA::Any *any) const
 {
-  p.argument <<= S_forany (this->x_);
-  p.mode = CORBA::PARAM_INOUT;
+  this->Insert_Policy::any_insert (any, S_forany (this->x_));
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ==============================================================
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 CORBA::Boolean
 TAO::Out_Fixed_Array_SArgument_T<S,
                                  S_slice,
-                                 S_forany>::marshal (TAO_OutputCDR &cdr)
+                                 S_forany,
+                                 Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << S_forany (this->x_);
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 void
 TAO::Out_Fixed_Array_SArgument_T<S,
                                  S_slice,
-                                 S_forany>::interceptor_param (
-    Dynamic::Parameter & p)
+                                 S_forany,
+                                 Insert_Policy>::interceptor_value (
+    CORBA::Any *any) const
 {
-  p.argument <<= S_forany (this->x_);
-  p.mode = CORBA::PARAM_OUT;
+  this->Insert_Policy::any_insert (any, S_forany (this->x_));
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ============================================================
 
-template<typename S_slice, typename S_var, typename S_forany>
+template<typename S_slice,
+         typename S_var,
+         typename S_forany,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Ret_Fixed_Array_SArgument_T<S_slice,S_var,S_forany>::marshal (
+TAO::Ret_Fixed_Array_SArgument_T<S_slice,
+                                 S_var,
+                                 S_forany,
+                                 Insert_Policy>::marshal (
     TAO_OutputCDR & cdr
   )
 {
@@ -113,13 +141,18 @@ TAO::Ret_Fixed_Array_SArgument_T<S_slice,S_var,S_forany>::marshal (
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S_slice, typename S_var, typename S_forany>
+template<typename S_slice,
+         typename S_var,
+         typename S_forany,
+         typename Insert_Policy>
 void
-TAO::Ret_Fixed_Array_SArgument_T<S_slice,S_var,S_forany>::interceptor_result (
-    CORBA::Any * any
-  )
+TAO::Ret_Fixed_Array_SArgument_T<S_slice,
+                                 S_var,
+                                 S_forany,
+                                 Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  (*any) <<= S_forany (this->x_.ptr ());
+  this->Insert_Policy::any_insert (any, S_forany (this->x_.ptr ()));
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
diff --git a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h
index bfd112ad36c..369fd9afe4d 100644
--- a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h
+++ b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h
@@ -30,15 +30,18 @@ namespace TAO
    * @brief IN skeleton argument of fixed size element array.
    *
    */
-  template<typename S, typename S_slice, typename S_forany>
-  class In_Fixed_Array_SArgument_T : public Argument
+  template<typename S,
+           typename S_slice,
+           typename S_forany,
+           typename Insert_Policy>
+  class In_Fixed_Array_SArgument_T : public InArgument, private Insert_Policy
   {
   public:
     In_Fixed_Array_SArgument_T (void);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S_slice const * arg (void) const;
 
@@ -52,16 +55,19 @@ namespace TAO
    * @brief INOUT skeleton argument of fixed size element array.
    *
    */
-  template<typename S, typename S_slice, typename S_forany>
-  class Inout_Fixed_Array_SArgument_T : public Argument
+  template<typename S,
+           typename S_slice,
+           typename S_forany,
+           typename Insert_Policy>
+  class Inout_Fixed_Array_SArgument_T : public InoutArgument, private Insert_Policy
   {
   public:
     Inout_Fixed_Array_SArgument_T (void);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+    virtual CORBA::Boolean demarshal (TAO_InputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S_slice * arg (void);
 
@@ -75,15 +81,18 @@ namespace TAO
    * @brief OUT skeleton argument of fixed size element array.
    *
    */
-  template<typename S, typename S_slice, typename S_forany>
-  class Out_Fixed_Array_SArgument_T : public Argument
+  template<typename S,
+           typename S_slice,
+           typename S_forany,
+           typename Insert_Policy>
+  class Out_Fixed_Array_SArgument_T : public OutArgument, private Insert_Policy
   {
   public:
     Out_Fixed_Array_SArgument_T (void);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S_slice * arg (void);
 
@@ -97,15 +106,18 @@ namespace TAO
    * @brief Skeleton value of fixed size element array.
    *
    */
-  template<typename S_slice, typename S_var, typename S_forany>
-  class Ret_Fixed_Array_SArgument_T : public Argument
+  template<typename S_slice,
+           typename S_var,
+           typename S_forany,
+           typename Insert_Policy>
+  class Ret_Fixed_Array_SArgument_T : public RetArgument, private Insert_Policy
   {
   public:
     Ret_Fixed_Array_SArgument_T (void);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_result (CORBA::Any *);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S_slice *& arg (void);
 
@@ -122,33 +134,38 @@ namespace TAO
   template<typename T,
            typename T_slice,
            typename T_var,
-           typename T_forany>
+           typename T_forany,
+           typename Insert_Policy>
   struct Fixed_Array_SArg_Traits_T
   {
-    typedef T_slice *                                   ret_type;
-    typedef const T                                     in_type;
-    typedef T                                           inout_type;
-    typedef T                                           out_type;
+    typedef T_slice *                                    ret_type;
+    typedef const T                                      in_type;
+    typedef T                                            inout_type;
+    typedef T                                            out_type;
 
     typedef In_Fixed_Array_SArgument_T<T,
                                        T_slice,
-                                       T_forany>        in_arg_val;
+                                       T_forany,
+                                       Insert_Policy>    in_arg_val;
     typedef Inout_Fixed_Array_SArgument_T<T,
                                           T_slice,
-                                          T_forany>     inout_arg_val;
+                                          T_forany,
+                                          Insert_Policy> inout_arg_val;
     typedef Out_Fixed_Array_SArgument_T<T,
                                         T_slice,
-                                        T_forany>       out_arg_val;
+                                        T_forany,
+                                        Insert_Policy>   out_arg_val;
     typedef Ret_Fixed_Array_SArgument_T<T_slice,
                                         T_var,
-                                        T_forany>       ret_val;
+                                        T_forany,
+                                        Insert_Policy>   ret_val;
 
     // Typedefs corresponding to return value of arg() method in both
     // the client and server side argument class templates.
-    typedef T_slice const *                             in_arg_type;
-    typedef ret_type                                    inout_arg_type;
-    typedef ret_type                                    out_arg_type;
-    typedef ret_type &                                  ret_arg_type;
+    typedef T_slice const *                              in_arg_type;
+    typedef ret_type                                     inout_arg_type;
+    typedef ret_type                                     out_arg_type;
+    typedef ret_type &                                   ret_arg_type;
 
   };
 }
diff --git a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl
index 65b78d9416d..24a54390d96 100644
--- a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl
+++ b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl
@@ -2,17 +2,28 @@
 //
 // $Id$
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 ACE_INLINE
 TAO::In_Fixed_Array_SArgument_T<S,
                                 S_slice,
-                                S_forany>::In_Fixed_Array_SArgument_T (void)
-{}
+                                S_forany,
+                                Insert_Policy>::In_Fixed_Array_SArgument_T (void)
+{
+}
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 ACE_INLINE
 S_slice const *
-TAO::In_Fixed_Array_SArgument_T<S, S_slice, S_forany>::arg (void) const
+TAO::In_Fixed_Array_SArgument_T<S,
+                                S_slice,
+                                S_forany,
+                                Insert_Policy>::arg (void) const
 {
   S_forany tmp (this->x_);
   return tmp.in ();
@@ -20,20 +31,29 @@ TAO::In_Fixed_Array_SArgument_T<S, S_slice, S_forany>::arg (void) const
 
 // ===========================================================================
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 ACE_INLINE
 TAO::Inout_Fixed_Array_SArgument_T<S,
                                    S_slice,
-                                   S_forany>::
+                                   S_forany,
+                                   Insert_Policy>::
 Inout_Fixed_Array_SArgument_T (void)
-{}
+{
+}
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 ACE_INLINE
 S_slice *
 TAO::Inout_Fixed_Array_SArgument_T<S,
                                    S_slice,
-                                   S_forany>::arg (void)
+                                   S_forany,
+                                   Insert_Policy>::arg (void)
 {
   S_forany tmp (this->x_);
   return tmp.inout ();
@@ -41,19 +61,29 @@ TAO::Inout_Fixed_Array_SArgument_T<S,
 
 // ===========================================================================
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 ACE_INLINE
 TAO::Out_Fixed_Array_SArgument_T<S,
                                  S_slice,
-                                 S_forany>::Out_Fixed_Array_SArgument_T (void)
-{}
+                                 S_forany,
+                                 Insert_Policy>::
+Out_Fixed_Array_SArgument_T (void)
+{
+}
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 ACE_INLINE
 S_slice *
 TAO::Out_Fixed_Array_SArgument_T<S,
                                  S_slice,
-                                 S_forany>::arg (void)
+                                 S_forany,
+                                 Insert_Policy>::arg (void)
 {
   S_forany tmp (this->x_);
   return tmp.inout ();
@@ -61,16 +91,29 @@ TAO::Out_Fixed_Array_SArgument_T<S,
 
 // ===========================================================================
 
-template<typename S_slice, typename S_var, typename S_forany>
+template<typename S_slice,
+         typename S_var,
+         typename S_forany,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Ret_Fixed_Array_SArgument_T<S_slice,S_var,S_forany>::
+TAO::Ret_Fixed_Array_SArgument_T<S_slice,
+                                 S_var,
+                                 S_forany,
+                                 Insert_Policy>::
 Ret_Fixed_Array_SArgument_T (void)
-{}
+{
+}
 
-template<typename S_slice, typename S_var, typename S_forany>
+template<typename S_slice,
+         typename S_var,
+         typename S_forany,
+         typename Insert_Policy>
 ACE_INLINE
 S_slice *&
-TAO::Ret_Fixed_Array_SArgument_T<S_slice,S_var,S_forany>::arg (void)
+TAO::Ret_Fixed_Array_SArgument_T<S_slice,
+                                 S_var,
+                                 S_forany,
+                                 Insert_Policy>::arg (void)
 {
   return this->x_._retn_arg ();
 }
diff --git a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp
index e31e1aef094..a145529ec0c 100644
--- a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp
@@ -5,101 +5,106 @@
 
 #include "tao/PortableServer/Fixed_Size_SArgument_T.h"
 
-#if TAO_HAS_INTERCEPTORS == 1
-# include "tao/Dynamic_ParameterC.h"
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
 #if !defined (__ACE_INLINE__)
 #include "tao/PortableServer/Fixed_Size_SArgument_T.inl"
 #endif /* __ACE_INLINE__ */
 
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::In_Fixed_Size_SArgument_T<S>::demarshal (TAO_InputCDR & cdr)
+TAO::In_Fixed_Size_SArgument_T<S,Insert_Policy>::demarshal (TAO_InputCDR & cdr)
 {
   return cdr >> this->x_;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 void
-TAO::In_Fixed_Size_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p)
+TAO::In_Fixed_Size_SArgument_T<S,Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_IN;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ===========================================================
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_Fixed_Size_SArgument_T<S>::marshal (TAO_OutputCDR & cdr)
+TAO::Inout_Fixed_Size_SArgument_T<S,Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << this->x_;
 }
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_Fixed_Size_SArgument_T<S>::demarshal (TAO_InputCDR & cdr)
+TAO::Inout_Fixed_Size_SArgument_T<S,Insert_Policy>::demarshal (
+  TAO_InputCDR & cdr)
 {
   return cdr >> this->x_;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 void
-TAO::Inout_Fixed_Size_SArgument_T<S>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::Inout_Fixed_Size_SArgument_T<S,Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_INOUT;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ==============================================================
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Out_Fixed_Size_SArgument_T<S>::marshal (TAO_OutputCDR &cdr)
+TAO::Out_Fixed_Size_SArgument_T<S,Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << this->x_;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 void
-TAO::Out_Fixed_Size_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p)
+TAO::Out_Fixed_Size_SArgument_T<S,Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_OUT;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ============================================================
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Ret_Fixed_Size_SArgument_T<S>::marshal (TAO_OutputCDR & cdr)
+TAO::Ret_Fixed_Size_SArgument_T<S,Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << this->x_;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 void
-TAO::Ret_Fixed_Size_SArgument_T<S>::interceptor_result (CORBA::Any * any)
+TAO::Ret_Fixed_Size_SArgument_T<S,Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  (*any) <<= this->x_;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
diff --git a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h
index dda407ab99c..b7d77ee05d3 100644
--- a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h
+++ b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h
@@ -35,8 +35,8 @@ namespace TAO
    * Skeleton class template for operation "IN" arguments of fixed
    * size IDL types.
    */
-  template<typename S>
-  class In_Fixed_Size_SArgument_T : public Argument
+  template<typename S, typename Insert_Policy>
+  class In_Fixed_Size_SArgument_T : public InArgument, private Insert_Policy
   {
   public:
 
@@ -52,7 +52,7 @@ namespace TAO
     virtual CORBA::Boolean demarshal (TAO_InputCDR & cdr);
 
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter & p);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     //@}
 
@@ -74,8 +74,8 @@ namespace TAO
    * @brief Template class for INOUT skeleton arg of fixed size IDL types.
    *
    */
-  template<typename S>
-  class Inout_Fixed_Size_SArgument_T : public Argument
+  template<typename S, typename Insert_Policy>
+  class Inout_Fixed_Size_SArgument_T : public InoutArgument, private Insert_Policy
   {
   public:
 
@@ -91,10 +91,10 @@ namespace TAO
      * @see @c TAO::Argument.
      */
     //@{
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     //@}
 
@@ -113,8 +113,8 @@ namespace TAO
    * @brief Template class for OUT skeleton argument of fixed size IDL types.
    *
    */
-  template<typename S>
-  class Out_Fixed_Size_SArgument_T : public Argument
+  template<typename S, typename Insert_Policy>
+  class Out_Fixed_Size_SArgument_T : public OutArgument, private Insert_Policy
   {
   public:
 
@@ -130,9 +130,9 @@ namespace TAO
      * @see @c TAO::Argument.
      */
     //@{
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     //@}
 
@@ -152,8 +152,8 @@ namespace TAO
    * @brief Template class for return skeleton value of fixed size IDL types.
    *
    */
-  template<typename S>
-  class Ret_Fixed_Size_SArgument_T : public Argument
+  template<typename S, typename Insert_Policy>
+  class Ret_Fixed_Size_SArgument_T : public RetArgument, private Insert_Policy
   {
   public:
 
@@ -169,9 +169,9 @@ namespace TAO
      * @see @c TAO::Argument.
      */
     //@{
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_result (CORBA::Any *);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     //@}
 
@@ -191,25 +191,25 @@ namespace TAO
    * @brief Template class for argument traits of fixed size IDL types.
    *
    */
-  template<typename T>
+  template<typename T, typename Insert_Policy>
   struct Fixed_Size_SArg_Traits_T
   {
-    typedef T                                 ret_type;
-    typedef T const &                         in_type;
-    typedef T &                               inout_type;
-    typedef T &                               out_type;
+    typedef T                                               ret_type;
+    typedef T const &                                       in_type;
+    typedef T &                                             inout_type;
+    typedef T &                                             out_type;
 
-    typedef In_Fixed_Size_SArgument_T<T>      in_arg_val;
-    typedef Inout_Fixed_Size_SArgument_T<T>   inout_arg_val;
-    typedef Out_Fixed_Size_SArgument_T<T>     out_arg_val;
-    typedef Ret_Fixed_Size_SArgument_T<T>     ret_val;
+    typedef In_Fixed_Size_SArgument_T<T,Insert_Policy>      in_arg_val;
+    typedef Inout_Fixed_Size_SArgument_T<T,Insert_Policy>   inout_arg_val;
+    typedef Out_Fixed_Size_SArgument_T<T,Insert_Policy>     out_arg_val;
+    typedef Ret_Fixed_Size_SArgument_T<T,Insert_Policy>     ret_val;
 
     // Typedefs corresponding to return value of arg() method in both
     // the client and server side argument class templates.
-    typedef in_type                           in_arg_type;
-    typedef inout_type                        inout_arg_type;
-    typedef out_type                          out_arg_type;
-    typedef out_type                          ret_arg_type;
+    typedef in_type                                         in_arg_type;
+    typedef inout_type                                      inout_arg_type;
+    typedef out_type                                        out_arg_type;
+    typedef out_type                                        ret_arg_type;
 
   };
 
diff --git a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.inl b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.inl
index 0455d607179..05e29ce35a6 100644
--- a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.inl
+++ b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.inl
@@ -2,53 +2,66 @@
 //
 // $Id$
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 ACE_INLINE
 S const &
-TAO::In_Fixed_Size_SArgument_T<S>::arg (void) const
+TAO::In_Fixed_Size_SArgument_T<S,Insert_Policy>::arg (void) const
 {
   return this->x_;
 }
 
 // ==========================================================================
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Inout_Fixed_Size_SArgument_T<S>::Inout_Fixed_Size_SArgument_T (void)
-{}
+TAO::Inout_Fixed_Size_SArgument_T<S,Insert_Policy>::
+Inout_Fixed_Size_SArgument_T (void)
+{
+}
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
+ACE_INLINE
 S &
-TAO::Inout_Fixed_Size_SArgument_T<S>::arg (void)
+TAO::Inout_Fixed_Size_SArgument_T<S,Insert_Policy>::arg (void)
 {
   return this->x_;
 }
 
 // ==========================================================================
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Out_Fixed_Size_SArgument_T<S>::Out_Fixed_Size_SArgument_T (void)
+TAO::Out_Fixed_Size_SArgument_T<S,
+                                Insert_Policy>::
+Out_Fixed_Size_SArgument_T (void)
 {}
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
+ACE_INLINE
 S &
-TAO::Out_Fixed_Size_SArgument_T<S>::arg (void)
+TAO::Out_Fixed_Size_SArgument_T<S,Insert_Policy>::arg (void)
 {
   return this->x_;
 }
 
 // ==========================================================================
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Ret_Fixed_Size_SArgument_T<S>::Ret_Fixed_Size_SArgument_T (void)
+TAO::Ret_Fixed_Size_SArgument_T<S,Insert_Policy>::Ret_Fixed_Size_SArgument_T (void)
 {}
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 ACE_INLINE
 S &
-TAO::Ret_Fixed_Size_SArgument_T<S>::arg (void)
+TAO::Ret_Fixed_Size_SArgument_T<S,Insert_Policy>::arg (void)
 {
   return this->x_;
 }
diff --git a/TAO/tao/PortableServer/ForwardRequestA.cpp b/TAO/tao/PortableServer/ForwardRequestA.cpp
index 618f11ee0db..94b7aa7216f 100644
--- a/TAO/tao/PortableServer/ForwardRequestA.cpp
+++ b/TAO/tao/PortableServer/ForwardRequestA.cpp
@@ -25,15 +25,21 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "ForwardRequestC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
+#include "ForwardRequestA.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
+
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr PortableServer::ForwardRequest::_tao_type (void) const
+{
+  return ::PortableServer::_tc_ForwardRequest;
+}
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/struct_typecode.cpp:87
diff --git a/TAO/tao/PortableServer/ForwardRequestA.h b/TAO/tao/PortableServer/ForwardRequestA.h
new file mode 100644
index 00000000000..11f8a66ffd8
--- /dev/null
+++ b/TAO/tao/PortableServer/ForwardRequestA.h
@@ -0,0 +1,66 @@
+// -*- 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/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:754
+
+#ifndef _TAO_IDL_FORWARDREQUESTA_H_
+#define _TAO_IDL_FORWARDREQUESTA_H_
+
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+#include "ForwardRequestC.h"
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:59
+
+namespace PortableServer
+{
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
+  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ForwardRequest;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:86
+
+} // module PortableServer
+
+// TAO_IDL - Generated from
+// be\be_visitor_exception/any_op_ch.cpp:53
+
+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
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::ForwardRequest *&);
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
diff --git a/TAO/tao/PortableServer/ForwardRequestC.cpp b/TAO/tao/PortableServer/ForwardRequestC.cpp
index 1389d40971e..c062858725e 100644
--- a/TAO/tao/PortableServer/ForwardRequestC.cpp
+++ b/TAO/tao/PortableServer/ForwardRequestC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
 #include "ForwardRequestC.h"
@@ -34,10 +34,6 @@
 #include "tao/SystemException.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 #if (TAO_HAS_MINIMUM_POA == 0)
 
 // TAO_IDL - Generated from
@@ -166,11 +162,7 @@ PortableServer::ForwardRequest::ForwardRequest (
   this->forward_reference = CORBA::Object::_duplicate (_tao_forward_reference);
 }
 
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr PortableServer::ForwardRequest::_tao_type (void) const
-{
-  return ::PortableServer::_tc_ForwardRequest;
-}
+
 
 // TAO_IDL - Generated from
 // be\be_visitor_exception/cdr_op_cs.cpp:60
diff --git a/TAO/tao/PortableServer/ForwardRequestC.h b/TAO/tao/PortableServer/ForwardRequestC.h
index a9f92232cc7..54511944fb5 100644
--- a/TAO/tao/PortableServer/ForwardRequestC.h
+++ b/TAO/tao/PortableServer/ForwardRequestC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_FORWARDREQUESTC_H_
-#define _TAO_IDL_ORIG_FORWARDREQUESTC_H_
+#ifndef _TAO_IDL_FORWARDREQUESTC_H_
+#define _TAO_IDL_FORWARDREQUESTC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -50,47 +50,38 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PortableServer_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 #if (TAO_HAS_MINIMUM_POA == 0)
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace PortableServer
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_exception/exception_ch.cpp:53
 
 #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 ForwardRequest *_downcast (CORBA::Exception *);
     static const ForwardRequest *_downcast (CORBA::Exception const *);
-    
+
     static CORBA::Exception *_alloc (void);
-    
+
     virtual CORBA::Exception *_tao_duplicate (void) const;
 
     virtual void _raise (void) const;
@@ -99,34 +90,29 @@ namespace PortableServer
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL
       ) const;
-    
+
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ctor.cpp:66
-    
+
     ForwardRequest (
         const CORBA::Object_ptr  _tao_forward_reference
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:129
-    
+
     virtual CORBA::TypeCode_ptr _tao_type (void) const;
   };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ForwardRequest;
 
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module PortableServer
 
@@ -139,31 +125,15 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// 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
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::ForwardRequest *&);
-
-// TAO_IDL - Generated from
 // 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 &);
 
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:1028
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp b/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp
index d1dbdf43bb3..395f34da510 100644
--- a/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp
+++ b/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp
@@ -25,16 +25,16 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "IdAssignmentPolicyC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Enum_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
+#include "IdAssignmentPolicyA.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Enum_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Basic_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Basic_Impl_T.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/enum_typecode.cpp:34
@@ -108,78 +108,3 @@ CORBA::Boolean operator>>= (
         _tao_elem 
       );
 }
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::IdAssignmentPolicy>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::IdAssignmentPolicy>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::IdAssignmentPolicy>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// 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
-    );
-}
-
-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
-      );
-}
diff --git a/TAO/tao/PortableServer/IdAssignmentPolicyA.h b/TAO/tao/PortableServer/IdAssignmentPolicyA.h
new file mode 100644
index 00000000000..5e640efa07f
--- /dev/null
+++ b/TAO/tao/PortableServer/IdAssignmentPolicyA.h
@@ -0,0 +1,70 @@
+// -*- 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/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:754
+
+#ifndef _TAO_IDL_IDASSIGNMENTPOLICYA_H_
+#define _TAO_IDL_IDASSIGNMENTPOLICYA_H_
+
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+#include "IdAssignmentPolicyC.h"
+#include "tao/AnyTypeCode/PolicyA.h"
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:59
+
+namespace PortableServer
+{
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
+  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_IdAssignmentPolicyValue;
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
+  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_IdAssignmentPolicy;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:86
+
+} // module PortableServer
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdAssignmentPolicyValue);
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::IdAssignmentPolicyValue &);
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
diff --git a/TAO/tao/PortableServer/IdAssignmentPolicyC.cpp b/TAO/tao/PortableServer/IdAssignmentPolicyC.cpp
index 5dac367c80d..dae4a91d05b 100644
--- a/TAO/tao/PortableServer/IdAssignmentPolicyC.cpp
+++ b/TAO/tao/PortableServer/IdAssignmentPolicyC.cpp
@@ -26,17 +26,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
 #include "IdAssignmentPolicyC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
@@ -88,14 +84,6 @@ PortableServer::IdAssignmentPolicy::IdAssignmentPolicy (void)
 PortableServer::IdAssignmentPolicy::~IdAssignmentPolicy (void)
 {}
 
-void 
-PortableServer::IdAssignmentPolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  IdAssignmentPolicy *_tao_tmp_pointer =
-    static_cast<IdAssignmentPolicy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
 PortableServer::IdAssignmentPolicy_ptr
 PortableServer::IdAssignmentPolicy::_narrow (
     CORBA::Object_ptr _tao_objref
diff --git a/TAO/tao/PortableServer/IdAssignmentPolicyC.h b/TAO/tao/PortableServer/IdAssignmentPolicyC.h
index 1773460d112..f7c43ec160d 100644
--- a/TAO/tao/PortableServer/IdAssignmentPolicyC.h
+++ b/TAO/tao/PortableServer/IdAssignmentPolicyC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_IDASSIGNMENTPOLICYC_H_
-#define _TAO_IDL_ORIG_IDASSIGNMENTPOLICYC_H_
+#ifndef _TAO_IDL_IDASSIGNMENTPOLICYC_H_
+#define _TAO_IDL_IDASSIGNMENTPOLICYC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -54,17 +54,8 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PortableServer_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#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
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace PortableServer
 {
@@ -81,11 +72,6 @@ namespace PortableServer
   typedef IdAssignmentPolicyValue &IdAssignmentPolicyValue_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_IdAssignmentPolicyValue;
-  
-  // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY__VAR_OUT_CH_)
@@ -141,7 +127,7 @@ namespace PortableServer
       return static_cast<IdAssignmentPolicy_ptr> (0);
     }
     
-    static void _tao_any_destructor (void *);
+    
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -198,14 +184,9 @@ namespace PortableServer
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_IdAssignmentPolicy;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module PortableServer
 
@@ -216,8 +197,8 @@ namespace PortableServer
 namespace TAO
 {
 
-#if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY__TRAITS_CH_)
-#define _PORTABLESERVER_IDASSIGNMENTPOLICY__TRAITS_CH_
+#if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY__TRAITS_)
+#define _PORTABLESERVER_IDASSIGNMENTPOLICY__TRAITS_
   
   template<>
   struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::IdAssignmentPolicy>
@@ -239,34 +220,13 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// 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
-// 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 &);
-
-// TAO_IDL - Generated from
 // be\be_visitor_enum/cdr_op_ch.cpp:50
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, PortableServer::IdAssignmentPolicyValue);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::IdAssignmentPolicyValue &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+// be\be_codegen.cpp:1028
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PortableServer/IdUniquenessPolicyA.cpp b/TAO/tao/PortableServer/IdUniquenessPolicyA.cpp
index 5be9e5f2571..2fc8e7ec024 100644
--- a/TAO/tao/PortableServer/IdUniquenessPolicyA.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessPolicyA.cpp
@@ -25,16 +25,16 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "IdUniquenessPolicyC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Enum_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
+#include "IdUniquenessPolicyA.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Enum_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Basic_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Basic_Impl_T.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/enum_typecode.cpp:34
@@ -108,78 +108,3 @@ CORBA::Boolean operator>>= (
         _tao_elem 
       );
 }
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::IdUniquenessPolicy>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::IdUniquenessPolicy>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::IdUniquenessPolicy>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// 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;
-}
-
-// 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
-    );
-}
-
-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
-      );
-}
diff --git a/TAO/tao/PortableServer/IdUniquenessPolicyA.h b/TAO/tao/PortableServer/IdUniquenessPolicyA.h
new file mode 100644
index 00000000000..22d04465329
--- /dev/null
+++ b/TAO/tao/PortableServer/IdUniquenessPolicyA.h
@@ -0,0 +1,70 @@
+// -*- 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/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:754
+
+#ifndef _TAO_IDL_IDUNIQUENESSPOLICYA_H_
+#define _TAO_IDL_IDUNIQUENESSPOLICYA_H_
+
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+#include "IdUniquenessPolicyC.h"
+#include "tao/AnyTypeCode/PolicyA.h"
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:59
+
+namespace PortableServer
+{
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
+  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_IdUniquenessPolicyValue;
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
+  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_IdUniquenessPolicy;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:86
+
+} // module PortableServer
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdUniquenessPolicyValue);
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::IdUniquenessPolicyValue &);
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
diff --git a/TAO/tao/PortableServer/IdUniquenessPolicyC.cpp b/TAO/tao/PortableServer/IdUniquenessPolicyC.cpp
index 2e2ab82386d..340160fd2fc 100644
--- a/TAO/tao/PortableServer/IdUniquenessPolicyC.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessPolicyC.cpp
@@ -26,17 +26,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
 #include "IdUniquenessPolicyC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
@@ -88,14 +84,6 @@ PortableServer::IdUniquenessPolicy::IdUniquenessPolicy (void)
 PortableServer::IdUniquenessPolicy::~IdUniquenessPolicy (void)
 {}
 
-void 
-PortableServer::IdUniquenessPolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  IdUniquenessPolicy *_tao_tmp_pointer =
-    static_cast<IdUniquenessPolicy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
 PortableServer::IdUniquenessPolicy_ptr
 PortableServer::IdUniquenessPolicy::_narrow (
     CORBA::Object_ptr _tao_objref
diff --git a/TAO/tao/PortableServer/IdUniquenessPolicyC.h b/TAO/tao/PortableServer/IdUniquenessPolicyC.h
index 936c9f6270a..dbdeb5d2ed6 100644
--- a/TAO/tao/PortableServer/IdUniquenessPolicyC.h
+++ b/TAO/tao/PortableServer/IdUniquenessPolicyC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_IDUNIQUENESSPOLICYC_H_
-#define _TAO_IDL_ORIG_IDUNIQUENESSPOLICYC_H_
+#ifndef _TAO_IDL_IDUNIQUENESSPOLICYC_H_
+#define _TAO_IDL_IDUNIQUENESSPOLICYC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -54,17 +54,8 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PortableServer_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#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
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace PortableServer
 {
@@ -81,11 +72,6 @@ namespace PortableServer
   typedef IdUniquenessPolicyValue &IdUniquenessPolicyValue_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_IdUniquenessPolicyValue;
-  
-  // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY__VAR_OUT_CH_)
@@ -141,7 +127,7 @@ namespace PortableServer
       return static_cast<IdUniquenessPolicy_ptr> (0);
     }
     
-    static void _tao_any_destructor (void *);
+    
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -198,14 +184,9 @@ namespace PortableServer
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_IdUniquenessPolicy;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module PortableServer
 
@@ -216,8 +197,8 @@ namespace PortableServer
 namespace TAO
 {
 
-#if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY__TRAITS_CH_)
-#define _PORTABLESERVER_IDUNIQUENESSPOLICY__TRAITS_CH_
+#if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY__TRAITS_)
+#define _PORTABLESERVER_IDUNIQUENESSPOLICY__TRAITS_
   
   template<>
   struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::IdUniquenessPolicy>
@@ -239,34 +220,13 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// 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
-// 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
 // be\be_visitor_enum/cdr_op_ch.cpp:50
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, PortableServer::IdUniquenessPolicyValue);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::IdUniquenessPolicyValue &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+// be\be_codegen.cpp:1028
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicyA.cpp b/TAO/tao/PortableServer/ImplicitActivationPolicyA.cpp
index 0ce2d782e30..9db229c2063 100644
--- a/TAO/tao/PortableServer/ImplicitActivationPolicyA.cpp
+++ b/TAO/tao/PortableServer/ImplicitActivationPolicyA.cpp
@@ -25,16 +25,16 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "ImplicitActivationPolicyC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Enum_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
+#include "ImplicitActivationPolicyA.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Enum_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Basic_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Basic_Impl_T.h"
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
@@ -111,79 +111,4 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ImplicitActivationPolicy>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ImplicitActivationPolicy>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ImplicitActivationPolicy>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// 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
-      );
-}
-
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicyA.h b/TAO/tao/PortableServer/ImplicitActivationPolicyA.h
new file mode 100644
index 00000000000..70e35ef75ac
--- /dev/null
+++ b/TAO/tao/PortableServer/ImplicitActivationPolicyA.h
@@ -0,0 +1,70 @@
+// -*- 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/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:754
+
+#ifndef _TAO_IDL_IMPLICITACTIVATIONPOLICYA_H_
+#define _TAO_IDL_IMPLICITACTIVATIONPOLICYA_H_
+
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+#include "ImplicitActivationPolicyC.h"
+#include "tao/AnyTypeCode/PolicyA.h"
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:59
+
+namespace PortableServer
+{
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
+  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ImplicitActivationPolicyValue;
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
+  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ImplicitActivationPolicy;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:86
+
+} // module PortableServer
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ImplicitActivationPolicyValue);
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ImplicitActivationPolicyValue &);
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp b/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp
index b837fe536a1..825dd9af720 100644
--- a/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp
+++ b/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp
@@ -26,17 +26,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
 #include "ImplicitActivationPolicyC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
@@ -90,14 +86,6 @@ PortableServer::ImplicitActivationPolicy::ImplicitActivationPolicy (void)
 PortableServer::ImplicitActivationPolicy::~ImplicitActivationPolicy (void)
 {}
 
-void 
-PortableServer::ImplicitActivationPolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ImplicitActivationPolicy *_tao_tmp_pointer =
-    static_cast<ImplicitActivationPolicy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
 PortableServer::ImplicitActivationPolicy_ptr
 PortableServer::ImplicitActivationPolicy::_narrow (
     CORBA::Object_ptr _tao_objref
diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicyC.h b/TAO/tao/PortableServer/ImplicitActivationPolicyC.h
index d91ea7858f4..3f849791505 100644
--- a/TAO/tao/PortableServer/ImplicitActivationPolicyC.h
+++ b/TAO/tao/PortableServer/ImplicitActivationPolicyC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_IMPLICITACTIVATIONPOLICYC_H_
-#define _TAO_IDL_ORIG_IMPLICITACTIVATIONPOLICYC_H_
+#ifndef _TAO_IDL_IMPLICITACTIVATIONPOLICYC_H_
+#define _TAO_IDL_IMPLICITACTIVATIONPOLICYC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -54,17 +54,8 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PortableServer_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#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
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace PortableServer
 {
@@ -82,11 +73,6 @@ namespace PortableServer
   typedef ImplicitActivationPolicyValue &ImplicitActivationPolicyValue_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ImplicitActivationPolicyValue;
-  
-  // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY__VAR_OUT_CH_)
@@ -142,7 +128,7 @@ namespace PortableServer
       return static_cast<ImplicitActivationPolicy_ptr> (0);
     }
     
-    static void _tao_any_destructor (void *);
+    
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -199,14 +185,9 @@ namespace PortableServer
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ImplicitActivationPolicy;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
@@ -220,8 +201,8 @@ namespace TAO
 {
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-#if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY__TRAITS_CH_)
-#define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY__TRAITS_CH_
+#if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY__TRAITS_)
+#define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY__TRAITS_
   
   template<>
   struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::ImplicitActivationPolicy>
@@ -240,26 +221,9 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
-#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_ch.cpp:51
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ImplicitActivationPolicyValue);
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ImplicitActivationPolicyValue &);
-
-// TAO_IDL - Generated from
-// 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
 // be\be_visitor_enum/cdr_op_ch.cpp:50
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, PortableServer::ImplicitActivationPolicyValue);
@@ -268,15 +232,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableSer
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+// be\be_codegen.cpp:1028
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PortableServer/LifespanPolicyA.cpp b/TAO/tao/PortableServer/LifespanPolicyA.cpp
index 7aa2788a380..d9cd21d3b48 100644
--- a/TAO/tao/PortableServer/LifespanPolicyA.cpp
+++ b/TAO/tao/PortableServer/LifespanPolicyA.cpp
@@ -25,16 +25,16 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "LifespanPolicyC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Enum_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
+#include "LifespanPolicyA.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Enum_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Basic_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Basic_Impl_T.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/enum_typecode.cpp:34
@@ -108,78 +108,3 @@ CORBA::Boolean operator>>= (
         _tao_elem 
       );
 }
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::LifespanPolicy>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::LifespanPolicy>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::LifespanPolicy>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// 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
-      );
-}
diff --git a/TAO/tao/PortableServer/LifespanPolicyA.h b/TAO/tao/PortableServer/LifespanPolicyA.h
new file mode 100644
index 00000000000..cd12e1ef5b5
--- /dev/null
+++ b/TAO/tao/PortableServer/LifespanPolicyA.h
@@ -0,0 +1,70 @@
+// -*- 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/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:754
+
+#ifndef _TAO_IDL_LIFESPANPOLICYA_H_
+#define _TAO_IDL_LIFESPANPOLICYA_H_
+
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+#include "LifespanPolicyC.h"
+#include "tao/AnyTypeCode/PolicyA.h"
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:59
+
+namespace PortableServer
+{
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
+  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_LifespanPolicyValue;
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
+  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_LifespanPolicy;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:86
+
+} // module PortableServer
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::LifespanPolicyValue);
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::LifespanPolicyValue &);
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
diff --git a/TAO/tao/PortableServer/LifespanPolicyC.cpp b/TAO/tao/PortableServer/LifespanPolicyC.cpp
index b53023fc5af..832e35bf202 100644
--- a/TAO/tao/PortableServer/LifespanPolicyC.cpp
+++ b/TAO/tao/PortableServer/LifespanPolicyC.cpp
@@ -26,17 +26,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
 #include "LifespanPolicyC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
@@ -88,14 +84,6 @@ PortableServer::LifespanPolicy::LifespanPolicy (void)
 PortableServer::LifespanPolicy::~LifespanPolicy (void)
 {}
 
-void 
-PortableServer::LifespanPolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  LifespanPolicy *_tao_tmp_pointer =
-    static_cast<LifespanPolicy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
 PortableServer::LifespanPolicy_ptr
 PortableServer::LifespanPolicy::_narrow (
     CORBA::Object_ptr _tao_objref
diff --git a/TAO/tao/PortableServer/LifespanPolicyC.h b/TAO/tao/PortableServer/LifespanPolicyC.h
index b3eb4d69ed9..6863d502a76 100644
--- a/TAO/tao/PortableServer/LifespanPolicyC.h
+++ b/TAO/tao/PortableServer/LifespanPolicyC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_LIFESPANPOLICYC_H_
-#define _TAO_IDL_ORIG_LIFESPANPOLICYC_H_
+#ifndef _TAO_IDL_LIFESPANPOLICYC_H_
+#define _TAO_IDL_LIFESPANPOLICYC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -54,17 +54,8 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PortableServer_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#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
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace PortableServer
 {
@@ -81,11 +72,6 @@ namespace PortableServer
   typedef LifespanPolicyValue &LifespanPolicyValue_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_LifespanPolicyValue;
-  
-  // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_PORTABLESERVER_LIFESPANPOLICY__VAR_OUT_CH_)
@@ -141,7 +127,7 @@ namespace PortableServer
       return static_cast<LifespanPolicy_ptr> (0);
     }
     
-    static void _tao_any_destructor (void *);
+    
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -198,14 +184,9 @@ namespace PortableServer
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_LifespanPolicy;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module PortableServer
 
@@ -216,8 +197,8 @@ namespace PortableServer
 namespace TAO
 {
 
-#if !defined (_PORTABLESERVER_LIFESPANPOLICY__TRAITS_CH_)
-#define _PORTABLESERVER_LIFESPANPOLICY__TRAITS_CH_
+#if !defined (_PORTABLESERVER_LIFESPANPOLICY__TRAITS_)
+#define _PORTABLESERVER_LIFESPANPOLICY__TRAITS_
   
   template<>
   struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::LifespanPolicy>
@@ -239,34 +220,13 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// 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
-// 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
 // be\be_visitor_enum/cdr_op_ch.cpp:50
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, PortableServer::LifespanPolicyValue);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::LifespanPolicyValue &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+// be\be_codegen.cpp:1028
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PortableServer/Object_SArg_Traits.h b/TAO/tao/PortableServer/Object_SArg_Traits.h
index f67ee690ea3..1e60217f11d 100644
--- a/TAO/tao/PortableServer/Object_SArg_Traits.h
+++ b/TAO/tao/PortableServer/Object_SArg_Traits.h
@@ -22,8 +22,9 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/PortableServer/Object_SArgument_T.h"
+#include "tao/PortableServer/SArg_Traits_T.h"
 #include "tao/Pseudo_VarOut_T.h"
-
+#include "tao/Any_Insert_Policy_T.h"
 
 namespace CORBA
 {
@@ -38,15 +39,14 @@ namespace CORBA
 
 namespace TAO
 {
-  template <typename T> class SArg_Traits;
-
   /// Used in generated code if CORBA::Object is an argument or
   /// return type.
   template<>
   class TAO_PortableServer_Export SArg_Traits<CORBA::Object>
     : public Object_SArg_Traits_T<CORBA::Object_ptr,
                                   CORBA::Object_var,
-                                  CORBA::Object_out>
+                                  CORBA::Object_out,
+                                  TAO::Any_Insert_Policy_Stream <CORBA::Object_ptr> >
   {
   };
 }
diff --git a/TAO/tao/PortableServer/Object_SArgument_T.cpp b/TAO/tao/PortableServer/Object_SArgument_T.cpp
index 9a0c2906035..2146062474a 100644
--- a/TAO/tao/PortableServer/Object_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Object_SArgument_T.cpp
@@ -4,105 +4,117 @@
 #define TAO_OBJECT_SARGUMENT_T_CPP
 
 #include "tao/PortableServer/Object_SArgument_T.h"
-#include "tao/Dynamic_ParameterC.h"
 
 #if !defined (__ACE_INLINE__)
 #include "tao/PortableServer/Object_SArgument_T.inl"
 #endif /* __ACE_INLINE__ */
 
 
-template<typename S_ptr, typename S_var>
+template<typename S_ptr,
+         typename S_var,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::In_Object_SArgument_T<S_ptr,S_var>::demarshal (TAO_InputCDR &cdr)
+TAO::In_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::demarshal (TAO_InputCDR &cdr)
 {
   return cdr >> this->x_.out ();
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S_ptr, typename S_var>
+template<typename S_ptr,
+         typename S_var,
+         typename Insert_Policy>
 void
-TAO::In_Object_SArgument_T<S_ptr,S_var>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::In_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  p.argument <<= this->x_.in ();
-  p.mode = CORBA::PARAM_IN;
+  this->Insert_Policy::any_insert (any, this->x_.in ());
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ===========================================================
 
-template<typename S_ptr, typename S_var>
+template<typename S_ptr,
+         typename S_var,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_Object_SArgument_T<S_ptr,S_var>::marshal (TAO_OutputCDR & cdr)
+TAO::Inout_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << this->x_.in ();
 }
 
-template<typename S_ptr, typename S_var>
+template<typename S_ptr,
+         typename S_var,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_Object_SArgument_T<S_ptr,S_var>::demarshal (TAO_InputCDR & cdr)
+TAO::Inout_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::demarshal (TAO_InputCDR & cdr)
 {
   return cdr >> this->x_.out ();
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S_ptr, typename S_var>
+template<typename S_ptr,
+         typename S_var,
+         typename Insert_Policy>
 void
-TAO::Inout_Object_SArgument_T<S_ptr,S_var>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::Inout_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  p.argument <<= this->x_.in ();
-  p.mode = CORBA::PARAM_INOUT;
+  this->Insert_Policy::any_insert (any, this->x_.in ());
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ==============================================================
 
-template<typename S_ptr, typename S_var, typename S_out>
+template<typename S_ptr,
+         typename S_var,
+         typename S_out,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Out_Object_SArgument_T<S_ptr,S_var,S_out>::marshal (TAO_OutputCDR &cdr)
+TAO::Out_Object_SArgument_T<S_ptr,S_var,S_out,Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << this->x_.in ();
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S_ptr, typename S_var, typename S_out>
+template<typename S_ptr,
+         typename S_var,
+         typename S_out,
+         typename Insert_Policy>
 void
-TAO::Out_Object_SArgument_T<S_ptr,S_var,S_out>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::Out_Object_SArgument_T<S_ptr,S_var,S_out,Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  p.argument <<= this->x_.in ();
-  p.mode = CORBA::PARAM_OUT;
+  this->Insert_Policy::any_insert (any, this->x_.in ());
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ============================================================
 
-template<typename S_ptr, typename S_var>
+template<typename S_ptr,
+         typename S_var,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Ret_Object_SArgument_T<S_ptr,S_var>::marshal (TAO_OutputCDR & cdr)
+TAO::Ret_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << this->x_.in ();
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S_ptr, typename S_var>
+template<typename S_ptr,
+         typename S_var,
+         typename Insert_Policy>
 void
-TAO::Ret_Object_SArgument_T<S_ptr,S_var>::interceptor_result (
-    CORBA::Any * any
-  )
+TAO::Ret_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  (*any) <<= this->x_.in ();
+  this->Insert_Policy::any_insert (any, this->x_.in ());
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
diff --git a/TAO/tao/PortableServer/Object_SArgument_T.h b/TAO/tao/PortableServer/Object_SArgument_T.h
index b1e5e1a864e..733beda2955 100644
--- a/TAO/tao/PortableServer/Object_SArgument_T.h
+++ b/TAO/tao/PortableServer/Object_SArgument_T.h
@@ -35,14 +35,16 @@ namespace TAO
    * @brief Template class for IN skeleton object argument.
    *
    */
-  template<typename S_ptr, typename S_var>
-  class In_Object_SArgument_T : public Argument
+  template<typename S_ptr,
+           typename S_var,
+           typename Insert_Policy>
+  class In_Object_SArgument_T : public InArgument, private Insert_Policy
   {
   public:
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S_ptr arg (void) const;
 
@@ -56,16 +58,18 @@ namespace TAO
    * @brief Template class for INOUT skeleton object argument.
    *
    */
-  template<typename S_ptr, typename S_var>
-  class Inout_Object_SArgument_T : public Argument
+  template<typename S_ptr,
+           typename S_var,
+           typename Insert_Policy>
+  class Inout_Object_SArgument_T : public InoutArgument, private Insert_Policy
   {
   public:
     Inout_Object_SArgument_T (void);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S_ptr & arg (void);
 
@@ -79,15 +83,18 @@ namespace TAO
    * @brief Template class for INOUT skeleton object argument.
    *
    */
-  template<typename S_ptr, typename S_var, typename S_out>
-  class Out_Object_SArgument_T : public Argument
+  template<typename S_ptr,
+           typename S_var,
+           typename S_out,
+           typename Insert_Policy>
+  class Out_Object_SArgument_T : public OutArgument, private Insert_Policy
   {
   public:
     Out_Object_SArgument_T (void);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S_out arg (void);
 
@@ -101,15 +108,17 @@ namespace TAO
    * @brief Template class for return skeleton value of object.
    *
    */
-  template<typename S_ptr, typename S_var>
-  class Ret_Object_SArgument_T : public Argument
+  template<typename S_ptr,
+           typename S_var,
+           typename Insert_Policy>
+  class Ret_Object_SArgument_T : public RetArgument, private Insert_Policy
   {
   public:
     Ret_Object_SArgument_T (void);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_result (CORBA::Any *);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S_ptr & arg (void);
 
@@ -123,7 +132,10 @@ namespace TAO
    * @brief Template class for skeleton argument traits of objects.
    *
    */
-  template<typename T_ptr, typename T_var, typename T_out>
+  template<typename T_ptr,
+           typename T_var,
+           typename T_out,
+           typename Insert_Policy>
   struct Object_SArg_Traits_T
   {
     typedef T_ptr                                         ret_type;
@@ -131,10 +143,10 @@ namespace TAO
     typedef T_ptr &                                       inout_type;
     typedef T_out                                         out_type;
 
-    typedef In_Object_SArgument_T<T_ptr,T_var>            in_arg_val;
-    typedef Inout_Object_SArgument_T<T_ptr,T_var>         inout_arg_val;
-    typedef Out_Object_SArgument_T<T_ptr,T_var,T_out>     out_arg_val;
-    typedef Ret_Object_SArgument_T<T_ptr,T_var>           ret_val;
+    typedef In_Object_SArgument_T<T_ptr,T_var,Insert_Policy>        in_arg_val;
+    typedef Inout_Object_SArgument_T<T_ptr,T_var,Insert_Policy>     inout_arg_val;
+    typedef Out_Object_SArgument_T<T_ptr,T_var,T_out,Insert_Policy> out_arg_val;
+    typedef Ret_Object_SArgument_T<T_ptr,T_var,Insert_Policy>       ret_val;
 
     // Typedefs corresponding to return value of arg() method in both
     // the client and server side argument class templates.
diff --git a/TAO/tao/PortableServer/Object_SArgument_T.inl b/TAO/tao/PortableServer/Object_SArgument_T.inl
index 9588e14e67b..a202807a59d 100644
--- a/TAO/tao/PortableServer/Object_SArgument_T.inl
+++ b/TAO/tao/PortableServer/Object_SArgument_T.inl
@@ -3,57 +3,77 @@
 // $Id$
 
 
-template<typename S_ptr, typename S_var>
+template<typename S_ptr,
+         typename S_var,
+         typename Insert_Policy>
 ACE_INLINE
 S_ptr
-TAO::In_Object_SArgument_T<S_ptr,S_var>::arg (void) const
+TAO::In_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::arg (void) const
 {
   return this->x_.in ();
 }
 
 // ==========================================================================
 
-template<typename S_ptr, typename S_var>
+template<typename S_ptr,
+         typename S_var,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Inout_Object_SArgument_T<S_ptr,S_var>::Inout_Object_SArgument_T (void)
-{}
+TAO::Inout_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::
+Inout_Object_SArgument_T (void)
+{
+}
 
-template<typename S_ptr, typename S_var>
+template<typename S_ptr,
+         typename S_var,
+         typename Insert_Policy>
 ACE_INLINE
 S_ptr&
-TAO::Inout_Object_SArgument_T<S_ptr,S_var>::arg (void)
+TAO::Inout_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::arg (void)
 {
   return this->x_.inout ();
 }
 
 // ==========================================================================
 
-template<typename S_ptr, typename S_var, typename S_out>
+template<typename S_ptr,
+         typename S_var,
+         typename S_out,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Out_Object_SArgument_T<S_ptr,S_var,S_out>::Out_Object_SArgument_T (
-    void
-  )
-{}
+TAO::Out_Object_SArgument_T<S_ptr,S_var,S_out,Insert_Policy>::
+Out_Object_SArgument_T (void)
+{
+}
 
-template<typename S_ptr, typename S_var, typename S_out>
+template<typename S_ptr,
+         typename S_var,
+         typename S_out,
+         typename Insert_Policy>
 ACE_INLINE
 S_out
-TAO::Out_Object_SArgument_T<S_ptr,S_var,S_out>::arg (void)
+TAO::Out_Object_SArgument_T<S_ptr,S_var,S_out,Insert_Policy>::arg (void)
 {
   return this->x_.out ();
 }
 
 // ==========================================================================
 
-template<typename S_ptr, typename S_var>
+template<typename S_ptr,
+         typename S_var,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Ret_Object_SArgument_T<S_ptr,S_var>::Ret_Object_SArgument_T (void)
-{}
+TAO::Ret_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::
+Ret_Object_SArgument_T (void)
+{
+}
 
-template<typename S_ptr, typename S_var>
+template<typename S_ptr,
+         typename S_var,
+         typename Insert_Policy>
 ACE_INLINE
 S_ptr &
-TAO::Ret_Object_SArgument_T<S_ptr,S_var>::arg (void)
+TAO::Ret_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::arg (void)
 {
   return this->x_.out ();
 }
diff --git a/TAO/tao/PortableServer/POAManagerA.cpp b/TAO/tao/PortableServer/POAManagerA.cpp
deleted file mode 100644
index 086da1ec2da..00000000000
--- a/TAO/tao/PortableServer/POAManagerA.cpp
+++ /dev/null
@@ -1,296 +0,0 @@
-// -*- 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/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "POAManagerC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Enum_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
-#include "tao/Any_Basic_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_PortableServer_POAManager_AdapterInactive = 0;
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_PortableServer_POAManager_AdapterInactive (
-    CORBA::tk_except,
-    "IDL:omg.org/PortableServer/POAManager/AdapterInactive:2.3",
-    "AdapterInactive",
-    _tao_fields_PortableServer_POAManager_AdapterInactive,
-    0);
-  
-::CORBA::TypeCode_ptr const PortableServer::POAManager::_tc_AdapterInactive =
-  &_tao_tc_PortableServer_POAManager_AdapterInactive;
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/enum_typecode.cpp:34
-
-static char const * const _tao_enumerators_PortableServer_POAManager_State[] =
-  {
-    "HOLDING",
-    "ACTIVE",
-    "DISCARDING",
-    "INACTIVE"
-    
-  };
-
-static TAO::TypeCode::Enum<char const *,
-                           char const * const *,
-                           TAO::Null_RefCount_Policy>
-  _tao_tc_PortableServer_POAManager_State (
-    "IDL:omg.org/PortableServer/POAManager/State:2.3",
-    "State",
-    _tao_enumerators_PortableServer_POAManager_State,
-    4);
-  
-::CORBA::TypeCode_ptr const PortableServer::POAManager::_tc_State =
-  &_tao_tc_PortableServer_POAManager_State;
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_PortableServer_POAManager (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/PortableServer/POAManager:2.3",
-    "POAManager");
-  
-namespace PortableServer
-{
-  ::CORBA::TypeCode_ptr const _tc_POAManager =
-    &_tao_tc_PortableServer_POAManager;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::POAManager>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::POAManager>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::POAManager>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// 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
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<PortableServer::POAManager::AdapterInactive>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<PortableServer::POAManager::AdapterInactive>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const PortableServer::POAManager::AdapterInactive &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableServer::POAManager::AdapterInactive>::insert_copy (
-      _tao_any,
-      PortableServer::POAManager::AdapterInactive::_tao_any_destructor,
-      PortableServer::POAManager::_tc_AdapterInactive,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::POAManager::AdapterInactive *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableServer::POAManager::AdapterInactive>::insert (
-      _tao_any,
-      PortableServer::POAManager::AdapterInactive::_tao_any_destructor,
-      PortableServer::POAManager::_tc_AdapterInactive,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::POAManager::AdapterInactive *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const PortableServer::POAManager::AdapterInactive *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const PortableServer::POAManager::AdapterInactive *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<PortableServer::POAManager::AdapterInactive>::extract (
-        _tao_any,
-        PortableServer::POAManager::AdapterInactive::_tao_any_destructor,
-        PortableServer::POAManager::_tc_AdapterInactive,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_enum/any_op_cs.cpp:52
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Basic_Impl_T<PortableServer::POAManager::State>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Basic_Impl_T<PortableServer::POAManager::State>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::POAManager::State _tao_elem
-  )
-{
-  TAO::Any_Basic_Impl_T<PortableServer::POAManager::State>::insert (
-      _tao_any,
-      PortableServer::POAManager::_tc_State,
-      _tao_elem
-    );
-}
-
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::POAManager::State &_tao_elem
-  )
-{
-  return
-    TAO::Any_Basic_Impl_T<PortableServer::POAManager::State>::extract (
-        _tao_any,
-        PortableServer::POAManager::_tc_State,
-        _tao_elem 
-      );
-}
diff --git a/TAO/tao/PortableServer/POAManagerC.cpp b/TAO/tao/PortableServer/POAManagerC.cpp
index b4ea95318c3..45f95ccca10 100644
--- a/TAO/tao/PortableServer/POAManagerC.cpp
+++ b/TAO/tao/PortableServer/POAManagerC.cpp
@@ -26,19 +26,25 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
 #include "POAManagerC.h"
 #include "tao/CDR.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Enum_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Basic_Impl_T.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
@@ -82,7 +88,7 @@ TAO::Objref_Traits<PortableServer::POAManager>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::POAManager::AdapterInactive::AdapterInactive (void)
@@ -177,20 +183,54 @@ CORBA::TypeCode_ptr PortableServer::POAManager::AdapterInactive::_tao_type (void
   return ::PortableServer::POAManager::_tc_AdapterInactive;
 }
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_PortableServer_POAManager_AdapterInactive = 0;
+static TAO::TypeCode::Struct<char const *,
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_PortableServer_POAManager_AdapterInactive (
+    CORBA::tk_except,
+    "IDL:omg.org/PortableServer/POAManager/AdapterInactive:2.3",
+    "AdapterInactive",
+    _tao_fields_PortableServer_POAManager_AdapterInactive,
+    0);
+  
+::CORBA::TypeCode_ptr const PortableServer::POAManager::_tc_AdapterInactive =
+  &_tao_tc_PortableServer_POAManager_AdapterInactive;
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/enum_typecode.cpp:34
+
+static char const * const _tao_enumerators_PortableServer_POAManager_State[] =
+  {
+    "HOLDING",
+    "ACTIVE",
+    "DISCARDING",
+    "INACTIVE"
+    
+  };
+
+static TAO::TypeCode::Enum<char const *,
+                           char const * const *,
+                           TAO::Null_RefCount_Policy>
+  _tao_tc_PortableServer_POAManager_State (
+    "IDL:omg.org/PortableServer/POAManager/State:2.3",
+    "State",
+    _tao_enumerators_PortableServer_POAManager_State,
+    4);
+  
+::CORBA::TypeCode_ptr const PortableServer::POAManager::_tc_State =
+  &_tao_tc_PortableServer_POAManager_State;
+
 PortableServer::POAManager::POAManager (void)
 {}
 
 PortableServer::POAManager::~POAManager (void)
 {}
 
-void
-PortableServer::POAManager::_tao_any_destructor (void *_tao_void_pointer)
-{
-  POAManager *_tao_tmp_pointer =
-    static_cast<POAManager *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
 PortableServer::POAManager_ptr
 PortableServer::POAManager::_narrow (
     CORBA::Object_ptr _tao_objref
@@ -198,7 +238,8 @@ PortableServer::POAManager::_narrow (
   )
 {
   return POAManager::_duplicate (
-    dynamic_cast<POAManager_ptr> (_tao_objref));
+      dynamic_cast<POAManager_ptr> (_tao_objref)
+    );
 }
 
 PortableServer::POAManager_ptr
@@ -207,7 +248,9 @@ PortableServer::POAManager::_unchecked_narrow (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  return POAManager::_duplicate (dynamic_cast<POAManager_ptr> (_tao_objref));
+  return POAManager::_duplicate (
+      dynamic_cast<POAManager_ptr> (_tao_objref)
+    );
 }
 
 PortableServer::POAManager_ptr
@@ -217,7 +260,7 @@ PortableServer::POAManager::_duplicate (POAManager_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -266,3 +309,21 @@ PortableServer::POAManager::marshal (TAO_OutputCDR &)
 {
   return false;
 }
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_PortableServer_POAManager (
+    CORBA::tk_local_interface,
+    "IDL:omg.org/PortableServer/POAManager:2.3",
+    "POAManager");
+  
+namespace PortableServer
+{
+  ::CORBA::TypeCode_ptr const _tc_POAManager =
+    &_tao_tc_PortableServer_POAManager;
+}
+
+
diff --git a/TAO/tao/PortableServer/POAManagerC.h b/TAO/tao/PortableServer/POAManagerC.h
index 52606904b70..d3ecf299d88 100644
--- a/TAO/tao/PortableServer/POAManagerC.h
+++ b/TAO/tao/PortableServer/POAManagerC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_POAMANAGERC_H_
-#define _TAO_IDL_ORIG_POAMANAGERC_H_
+#ifndef _TAO_IDL_POAMANAGERC_H_
+#define _TAO_IDL_POAMANAGERC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -52,17 +52,8 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PortableServer_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#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
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace PortableServer
 {
@@ -123,10 +114,10 @@ namespace PortableServer
       return static_cast<POAManager_ptr> (0);
     }
     
-    static void _tao_any_destructor (void *);
+    
     
     // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:51
+    // be\be_visitor_exception/exception_ch.cpp:53
 
 #if !defined (_PORTABLESERVER_POAMANAGER_ADAPTERINACTIVE_CH_)
 #define _PORTABLESERVER_POAMANAGER_ADAPTERINACTIVE_CH_
@@ -163,13 +154,13 @@ namespace PortableServer
         );
       
       // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:127
+      // be\be_visitor_exception/exception_ch.cpp:129
       
       virtual CORBA::TypeCode_ptr _tao_type (void) const;
     };
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     static ::CORBA::TypeCode_ptr const _tc_AdapterInactive;
 
@@ -189,7 +180,7 @@ namespace PortableServer
     typedef State &State_out;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     static ::CORBA::TypeCode_ptr const _tc_State;
     
@@ -207,8 +198,6 @@ namespace PortableServer
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
-#if (TAO_HAS_MINIMUM_POA == 0)
-
     virtual void hold_requests (
         ::CORBA::Boolean wait_for_completion
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -243,8 +232,6 @@ namespace PortableServer
         ::PortableServer::POAManager::AdapterInactive
       )) = 0;
     
-#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
@@ -282,12 +269,12 @@ namespace PortableServer
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_POAManager;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module PortableServer
 
@@ -298,8 +285,8 @@ namespace PortableServer
 namespace TAO
 {
 
-#if !defined (_PORTABLESERVER_POAMANAGER__TRAITS_CH_)
-#define _PORTABLESERVER_POAMANAGER__TRAITS_CH_
+#if !defined (_PORTABLESERVER_POAMANAGER__TRAITS_)
+#define _PORTABLESERVER_POAMANAGER__TRAITS_
   
   template<>
   struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::POAManager>
@@ -321,36 +308,7 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// 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
-// 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
-// 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
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+// be\be_codegen.cpp:1028
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PortableServer/POA_Current_Impl.cpp b/TAO/tao/PortableServer/POA_Current_Impl.cpp
index d692a3cba9e..3d51448e37f 100644
--- a/TAO/tao/PortableServer/POA_Current_Impl.cpp
+++ b/TAO/tao/PortableServer/POA_Current_Impl.cpp
@@ -39,7 +39,7 @@ namespace TAO
       this->object_key_ = &key;
 
       // Set the current context and remember the old one.
-      this->tss_resources_ = TAO_TSS_RESOURCES::instance ();
+      this->tss_resources_ = TAO_TSS_Resources::instance ();
 
       this->previous_current_impl_ =
         static_cast <POA_Current_Impl *>
diff --git a/TAO/tao/PortableServer/PS_ForwardA.cpp b/TAO/tao/PortableServer/PS_ForwardA.cpp
index 114d8f413ad..c9ba5596b79 100644
--- a/TAO/tao/PortableServer/PS_ForwardA.cpp
+++ b/TAO/tao/PortableServer/PS_ForwardA.cpp
@@ -25,12 +25,12 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "PS_ForwardC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
+#include "PS_ForwardA.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
+#include "tao/AnyTypeCode/Any.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/alias_typecode.cpp:50
diff --git a/TAO/tao/PortableServer/PS_ForwardA.h b/TAO/tao/PortableServer/PS_ForwardA.h
new file mode 100644
index 00000000000..7818c218778
--- /dev/null
+++ b/TAO/tao/PortableServer/PS_ForwardA.h
@@ -0,0 +1,59 @@
+// -*- 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/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:754
+
+#ifndef _TAO_IDL_PS_FORWARDA_H_
+#define _TAO_IDL_PS_FORWARDA_H_
+
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+#include "PS_ForwardC.h"
+#include "tao/AnyTypeCode/OctetSeqA.h"
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:59
+
+namespace PortableServer
+{
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
+  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ObjectId;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:86
+
+} // module PortableServer
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
diff --git a/TAO/tao/PortableServer/PS_ForwardC.cpp b/TAO/tao/PortableServer/PS_ForwardC.cpp
index f788c63a7a5..c39046225ac 100644
--- a/TAO/tao/PortableServer/PS_ForwardC.cpp
+++ b/TAO/tao/PortableServer/PS_ForwardC.cpp
@@ -26,17 +26,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
 #include "PS_ForwardC.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__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
diff --git a/TAO/tao/PortableServer/PS_ForwardC.h b/TAO/tao/PortableServer/PS_ForwardC.h
index afded66da78..24cb55a00f1 100644
--- a/TAO/tao/PortableServer/PS_ForwardC.h
+++ b/TAO/tao/PortableServer/PS_ForwardC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_PS_FORWARDC_H_
-#define _TAO_IDL_ORIG_PS_FORWARDC_H_
+#ifndef _TAO_IDL_PS_FORWARDC_H_
+#define _TAO_IDL_PS_FORWARDC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -52,15 +52,6 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PortableServer_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 class TAO_ServantBase;
 class TAO_ServantBase_var;
 class TAO_Local_ServantBase;
@@ -68,7 +59,7 @@ class TAO_Root_POA;
 class TAO_DynamicImplementation;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace PortableServer
 {
@@ -79,34 +70,29 @@ namespace PortableServer
 
     typedef TAO_Local_ServantBase LocalServantBase;
     typedef TAO_DynamicImplementation DynamicImplementation;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:472
-  
+
   typedef CORBA::OctetSeq ObjectId;
   typedef CORBA::OctetSeq_var ObjectId_var;
   typedef CORBA::OctetSeq_out ObjectId_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ObjectId;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_PORTABLESERVER_POA__VAR_OUT_CH_)
 #define _PORTABLESERVER_POA__VAR_OUT_CH_
-  
+
   class POA;
   typedef POA *POA_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         POA
       >
     POA_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         POA
@@ -116,7 +102,7 @@ namespace PortableServer
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module PortableServer
 
@@ -129,15 +115,7 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+// be\be_codegen.cpp:1028
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PortableServer/PolicyS.cpp b/TAO/tao/PortableServer/PolicyS.cpp
index 5f07633ff5c..a6ce46ed3dc 100644
--- a/TAO/tao/PortableServer/PolicyS.cpp
+++ b/TAO/tao/PortableServer/PolicyS.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_codegen.cpp:599
 
 #ifndef _TAO_IDL_ORIG_POLICYS_CPP_
@@ -53,8 +53,8 @@
 #include "tao/Stub.h"
 #include "tao/IFR_Client_Adapter.h"
 #include "tao/Object_T.h"
-#include "tao/TypeCode.h"
-#include "tao/DynamicC.h"
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/AnyTypeCode/Any.h"
 #include "tao/CDR.h"
 #include "tao/operation_details.h"
 #include "tao/PortableInterceptor.h"
@@ -76,14 +76,15 @@ namespace TAO
 
 #if !defined (_CORBA_POLICY__SARG_TRAITS_SS_)
 #define _CORBA_POLICY__SARG_TRAITS_SS_
-  
+
   template<>
   class  SArg_Traits<CORBA::Policy>
     : public
         Object_SArg_Traits_T<
             CORBA::Policy_ptr,
             CORBA::Policy_var,
-            CORBA::Policy_out
+            CORBA::Policy_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::Policy_ptr>
           >
   {
   };
@@ -101,7 +102,7 @@ namespace TAO
 
 #if !defined (_CORBA_POLICY__ARG_TRAITS_SS_)
 #define _CORBA_POLICY__ARG_TRAITS_SS_
-  
+
   template<>
   class  Arg_Traits<CORBA::Policy>
     : public
@@ -109,7 +110,8 @@ namespace TAO
             CORBA::Policy_ptr,
             CORBA::Policy_var,
             CORBA::Policy_out,
-            TAO::Objref_Traits<CORBA::Policy>
+            TAO::Objref_Traits<CORBA::Policy>,
+            TAO::Any_Insert_Policy_Stream <CORBA::Policy_ptr>
           >
   {
   };
@@ -245,7 +247,7 @@ POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::the_TAO_Policy_Strategized_Prox
 {
   static POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker
   strategized_proxy_broker;
-  
+
   return &strategized_proxy_broker;
 }
 
@@ -267,7 +269,7 @@ POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::get_strategy (
   TAO::Collocation_Strategy strategy =
     TAO_ORB_Core::collocation_strategy (obj ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (TAO::TAO_CS_REMOTE_STRATEGY);
-  
+
   return strategy;
 }
 
@@ -286,13 +288,13 @@ POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::dispatch (
 {
   TAO::Direct_Collocation_Upcall_Wrapper collocation_upcall_wrapper;
   collocation_upcall_wrapper.upcall (
-    obj, 
-    forward_obj, 
-    args, 
-    num_args, 
-    op, 
-    op_len, 
-    strategy 
+    obj,
+    forward_obj,
+    args,
+    num_args,
+    op,
+    op_len,
+    strategy
     ACE_ENV_ARG_PARAMETER);
 }
 
@@ -313,9 +315,9 @@ CORBA__TAO_Policy_Proxy_Broker_Factory_function (CORBA::Object_ptr)
 int
 CORBA__TAO_Policy_Proxy_Broker_Factory_Initializer (size_t)
 {
-  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;
 }
 
@@ -337,14 +339,14 @@ POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::_TAO_Policy_Direct_Proxy_Impl (void)
 POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::~_TAO_Policy_Direct_Proxy_Impl (void)
 {}
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::_get_policy_type (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -359,14 +361,14 @@ POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::_get_policy_type (
         );
   ACE_CHECK;
 }
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::copy (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -381,14 +383,14 @@ POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::copy (
         );
   ACE_CHECK;
 }
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::destroy (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument **,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -408,7 +410,7 @@ POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::destroy (
 //           End Direct Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::Policy::Policy (void)
@@ -428,11 +430,11 @@ POA_CORBA::Policy::~Policy (void)
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_policy_type_Policy
     : public TAO::Upcall_Command
   {
@@ -446,31 +448,31 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::PolicyType>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::PolicyType, TAO::SArg_Traits< ::CORBA::PolicyType>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
-      
+
+
       retval =
         this->servant_->policy_type (
           ACE_ENV_SINGLE_ARG_PARAMETER);
-        
+
     }
-  
+
   private:
     POA_CORBA::Policy * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::Policy::_get_policy_type_skel (
@@ -480,22 +482,22 @@ void POA_CORBA::Policy::_get_policy_type_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::PolicyType>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::Policy * const impl =
     static_cast<POA_CORBA::Policy *> (servant);
 
@@ -503,7 +505,7 @@ void POA_CORBA::Policy::_get_policy_type_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -516,15 +518,15 @@ void POA_CORBA::Policy::_get_policy_type_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class copy_Policy
     : public TAO::Upcall_Command
   {
@@ -538,31 +540,31 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< CORBA::Policy>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< CORBA::Policy, TAO::SArg_Traits< CORBA::Policy>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
-      
+
+
       retval =
         this->servant_->copy (
           ACE_ENV_SINGLE_ARG_PARAMETER);
-        
+
     }
-  
+
   private:
     POA_CORBA::Policy * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::Policy::copy_skel (
@@ -572,22 +574,22 @@ void POA_CORBA::Policy::copy_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< CORBA::Policy>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::Policy * const impl =
     static_cast<POA_CORBA::Policy *> (servant);
 
@@ -595,7 +597,7 @@ void POA_CORBA::Policy::copy_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -608,15 +610,15 @@ void POA_CORBA::Policy::copy_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class destroy_Policy
     : public TAO::Upcall_Command
   {
@@ -626,22 +628,22 @@ namespace POA_CORBA
       : servant_ (servant)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       this->servant_->destroy (
         ACE_ENV_SINGLE_ARG_PARAMETER);
-      
+
     }
-  
+
   private:
     POA_CORBA::Policy * const servant_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::Policy::destroy_skel (
@@ -651,28 +653,28 @@ void POA_CORBA::Policy::destroy_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::Policy * const impl =
     static_cast<POA_CORBA::Policy *> (servant);
 
   destroy_Policy command (
     impl);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -685,19 +687,19 @@ void POA_CORBA::Policy::destroy_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_Policy_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -711,68 +713,68 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
-      
+
+
       retval =
         this->servant_-> _is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
-        
+
     }
-  
+
   private:
     POA_CORBA::Policy * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::Policy::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::Policy * const impl =
     static_cast<POA_CORBA::Policy *> (servant);
-  
+
   _is_a_Policy_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -785,16 +787,16 @@ void POA_CORBA::Policy::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_Policy_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -808,59 +810,59 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
-      
+
+
       retval =
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
-        
+
     }
-  
+
   private:
     POA_CORBA::Policy * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::Policy::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::Policy * const impl =
     static_cast<POA_CORBA::Policy *> (servant);
-  
+
   _non_existent_Policy_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -873,18 +875,18 @@ void POA_CORBA::Policy::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:393
 
 
 
 void POA_CORBA::Policy::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -894,30 +896,30 @@ void POA_CORBA::Policy::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW (CORBA::INTF_REPOS (CORBA::OMGVMCID | 1,
                                     CORBA::COMPLETED_NO));
     }
-  
+
   POA_CORBA::Policy * const impl =
     static_cast<POA_CORBA::Policy *> (servant);
-  CORBA::InterfaceDef_ptr _tao_retval = 
+  CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -926,11 +928,11 @@ void POA_CORBA::Policy::_interface_skel (
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_Policy_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -944,59 +946,59 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
-      
+
+
       retval =
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
-        
+
     }
-  
+
   private:
     POA_CORBA::Policy * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::Policy::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::Policy * const impl =
     static_cast<POA_CORBA::Policy *> (servant);
-  
+
   _get_component_Policy_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1009,7 +1011,7 @@ void POA_CORBA::Policy::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 CORBA::Boolean POA_CORBA::Policy::_is_a (
@@ -1058,22 +1060,22 @@ 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 ();
-  
+
   CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::Policy STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -1082,48 +1084,5 @@ POA_CORBA::Policy::_this (ACE_ENV_SINGLE_ARG_DECL)
       );
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1582
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#if !defined (_CORBA_POLICY__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_POLICY__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::Policy>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::Policy_ptr,
-        CORBA::Policy_var,
-        CORBA::Policy_out,
-      >;
-
-#endif /* end #if !defined */
-
-  template class
-    TAO::Ret_Object_SArgument_T<
-        CORBA::Policy_ptr,
-        CORBA::Policy_var
-      >;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#if !defined (_CORBA_POLICY__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_POLICY__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::Policy>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::Policy_ptr, \
-        CORBA::Policy_var, \
-        CORBA::Policy_out, \
-      >
-
-#endif /* end #if !defined */
-
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
 #endif /* ifndef */
 
diff --git a/TAO/tao/PortableServer/PortableServer.h b/TAO/tao/PortableServer/PortableServer.h
index a02ed5baa1a..22bbb1dece3 100644
--- a/TAO/tao/PortableServer/PortableServer.h
+++ b/TAO/tao/PortableServer/PortableServer.h
@@ -37,6 +37,14 @@ TAO_Requires_POA_Initializer = TAO_POA_Initializer::init ();
 #include "POAManagerC.h"
 #include "PortableServer_Functions.h"
 #include "PortableServer_WFunctions.h"
+#include "PS_ForwardA.h"
+#include "IdAssignmentPolicyA.h"
+#include "IdUniquenessPolicyA.h"
+#include "ImplicitActivationPolicyA.h"
+#include "LifespanPolicyA.h"
+#include "RequestProcessingPolicyA.h"
+#include "ServantRetentionPolicyA.h"
+#include "ThreadPolicyA.h"
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PortableServer/PortableServerA.cpp b/TAO/tao/PortableServer/PortableServerA.cpp
index 9860625baec..0950e1449b4 100644
--- a/TAO/tao/PortableServer/PortableServerA.cpp
+++ b/TAO/tao/PortableServer/PortableServerA.cpp
@@ -26,18 +26,18 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "PortableServer.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Sequence_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/alias_typecode.cpp:50
diff --git a/TAO/tao/PortableServer/PortableServerC.cpp b/TAO/tao/PortableServer/PortableServerC.cpp
index 55d4fb81498..4c59d1769ad 100644
--- a/TAO/tao/PortableServer/PortableServerC.cpp
+++ b/TAO/tao/PortableServer/PortableServerC.cpp
@@ -47,7 +47,7 @@ namespace TAO
 {
 #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR__ARG_TRAITS_CS_)
 #define _PORTABLESERVER_ADAPTERACTIVATOR__ARG_TRAITS_CS_
-  
+
   template<>
   class  Arg_Traits<PortableServer::AdapterActivator>
     : public
@@ -55,7 +55,8 @@ namespace TAO
             PortableServer::AdapterActivator_ptr,
             PortableServer::AdapterActivator_var,
             PortableServer::AdapterActivator_out,
-            TAO::Objref_Traits<PortableServer::AdapterActivator>
+            TAO::Objref_Traits<PortableServer::AdapterActivator>,
+            TAO::Any_Insert_Policy_Stream <PortableServer::AdapterActivator_ptr>
           >
   {
   };
@@ -63,7 +64,7 @@ namespace TAO
 #endif /* end #if !defined */
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_PORTABLESERVER_POALIST_CS_)
@@ -155,7 +156,7 @@ TAO::Objref_Traits<PortableServer::POA>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::POA::AdapterAlreadyExists::AdapterAlreadyExists (void)
@@ -250,7 +251,7 @@ CORBA::TypeCode_ptr PortableServer::POA::AdapterAlreadyExists::_tao_type (void)
   return ::PortableServer::POA::_tc_AdapterAlreadyExists;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::POA::AdapterNonExistent::AdapterNonExistent (void)
@@ -345,7 +346,7 @@ CORBA::TypeCode_ptr PortableServer::POA::AdapterNonExistent::_tao_type (void) co
   return ::PortableServer::POA::_tc_AdapterNonExistent;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::POA::InvalidPolicy::InvalidPolicy (void)
@@ -458,7 +459,7 @@ CORBA::TypeCode_ptr PortableServer::POA::InvalidPolicy::_tao_type (void) const
   return ::PortableServer::POA::_tc_InvalidPolicy;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 #if (TAO_HAS_MINIMUM_POA == 0)
@@ -557,7 +558,7 @@ CORBA::TypeCode_ptr PortableServer::POA::NoServant::_tao_type (void) const
 
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::POA::ObjectAlreadyActive::ObjectAlreadyActive (void)
@@ -652,7 +653,7 @@ CORBA::TypeCode_ptr PortableServer::POA::ObjectAlreadyActive::_tao_type (void) c
   return ::PortableServer::POA::_tc_ObjectAlreadyActive;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::POA::ObjectNotActive::ObjectNotActive (void)
@@ -747,7 +748,7 @@ CORBA::TypeCode_ptr PortableServer::POA::ObjectNotActive::_tao_type (void) const
   return ::PortableServer::POA::_tc_ObjectNotActive;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::POA::ServantAlreadyActive::ServantAlreadyActive (void)
@@ -842,7 +843,7 @@ CORBA::TypeCode_ptr PortableServer::POA::ServantAlreadyActive::_tao_type (void)
   return ::PortableServer::POA::_tc_ServantAlreadyActive;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::POA::ServantNotActive::ServantNotActive (void)
@@ -937,7 +938,7 @@ CORBA::TypeCode_ptr PortableServer::POA::ServantNotActive::_tao_type (void) cons
   return ::PortableServer::POA::_tc_ServantNotActive;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::POA::WrongAdapter::WrongAdapter (void)
@@ -1032,7 +1033,7 @@ CORBA::TypeCode_ptr PortableServer::POA::WrongAdapter::_tao_type (void) const
   return ::PortableServer::POA::_tc_WrongAdapter;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::POA::WrongPolicy::WrongPolicy (void)
@@ -1133,7 +1134,7 @@ PortableServer::POA::POA (void)
 PortableServer::POA::~POA (void)
 {}
 
-void 
+void
 PortableServer::POA::_tao_any_destructor (void *_tao_void_pointer)
 {
   POA *_tao_tmp_pointer =
@@ -1170,7 +1171,7 @@ PortableServer::POA::_duplicate (POA_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
diff --git a/TAO/tao/PortableServer/PortableServerC.h b/TAO/tao/PortableServer/PortableServerC.h
index 6bd28fe3dc2..1287ed243e3 100644
--- a/TAO/tao/PortableServer/PortableServerC.h
+++ b/TAO/tao/PortableServer/PortableServerC.h
@@ -85,15 +85,15 @@
 
 namespace PortableServer
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_PORTABLESERVER_POALIST_CH_)
 #define _PORTABLESERVER_POALIST_CH_
-  
+
   class POAList;
-  
+
   typedef
     TAO_MngSeq_Var_T<
         POAList,
@@ -103,7 +103,7 @@ namespace PortableServer
           >
       >
     POAList_var;
-  
+
   typedef
     TAO_MngSeq_Out_T<
         POAList,
@@ -114,7 +114,7 @@ namespace PortableServer
           >
       >
     POAList_out;
-  
+
   class TAO_PortableServer_Export POAList
     : public
         TAO_Unbounded_Object_Sequence<
@@ -128,74 +128,74 @@ namespace PortableServer
     POAList (
         CORBA::ULong max,
         CORBA::ULong length,
-        POA_ptr* buffer, 
+        POA_ptr* buffer,
         CORBA::Boolean release = 0
       );
     POAList (const POAList &);
     ~POAList (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef POAList_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_POAList;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const CORBA::PolicyType THREAD_POLICY_ID = 16U;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const CORBA::PolicyType LIFESPAN_POLICY_ID = 17U;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const CORBA::PolicyType ID_UNIQUENESS_POLICY_ID = 18U;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const CORBA::PolicyType ID_ASSIGNMENT_POLICY_ID = 19U;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const CORBA::PolicyType IMPLICIT_ACTIVATION_POLICY_ID = 20U;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const CORBA::PolicyType SERVANT_RETENTION_POLICY_ID = 21U;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const CORBA::PolicyType REQUEST_PROCESSING_POLICY_ID = 22U;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_PORTABLESERVER_POAMANAGER__VAR_OUT_CH_)
 #define _PORTABLESERVER_POAMANAGER__VAR_OUT_CH_
-  
+
   class POAManager;
   typedef POAManager *POAManager_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         POAManager
       >
     POAManager_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         POAManager
@@ -203,22 +203,22 @@ namespace PortableServer
     POAManager_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR__VAR_OUT_CH_)
 #define _PORTABLESERVER_ADAPTERACTIVATOR__VAR_OUT_CH_
-  
+
   class AdapterActivator;
   typedef AdapterActivator *AdapterActivator_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         AdapterActivator
       >
     AdapterActivator_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         AdapterActivator
@@ -226,22 +226,22 @@ namespace PortableServer
     AdapterActivator_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_PORTABLESERVER_SERVANTMANAGER__VAR_OUT_CH_)
 #define _PORTABLESERVER_SERVANTMANAGER__VAR_OUT_CH_
-  
+
   class ServantManager;
   typedef ServantManager *ServantManager_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ServantManager
       >
     ServantManager_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ServantManager
@@ -249,22 +249,22 @@ namespace PortableServer
     ServantManager_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_PORTABLESERVER_POA__VAR_OUT_CH_)
 #define _PORTABLESERVER_POA__VAR_OUT_CH_
-  
+
   class POA;
   typedef POA *POA_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         POA
       >
     POA_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         POA
@@ -272,65 +272,65 @@ namespace PortableServer
     POA_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLESERVER_POA_CH_)
 #define _PORTABLESERVER_POA_CH_
-  
+
   class TAO_PortableServer_Export POA
     : public virtual CORBA::Object
   {
   public:
     typedef POA_ptr _ptr_type;
     typedef POA_var _var_type;
-    
+
     // The static operations.
     static POA_ptr _duplicate (POA_ptr obj);
-    
+
     static void _tao_release (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 static_cast<POA_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:53
 
 #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 const AdapterAlreadyExists *_downcast (CORBA::Exception const *);
-      
+
       static CORBA::Exception *_alloc (void);
-      
+
       virtual CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
@@ -339,48 +339,48 @@ namespace PortableServer
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:129
-      
+
       virtual CORBA::TypeCode_ptr _tao_type (void) const;
     };
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr const _tc_AdapterAlreadyExists;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:53
 
 #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 const AdapterNonExistent *_downcast (CORBA::Exception const *);
-      
+
       static CORBA::Exception *_alloc (void);
-      
+
       virtual CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
@@ -389,49 +389,49 @@ namespace PortableServer
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:129
-      
+
       virtual CORBA::TypeCode_ptr _tao_type (void) const;
     };
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr const _tc_AdapterNonExistent;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:53
 
 #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 const InvalidPolicy *_downcast (CORBA::Exception const *);
-      
+
       static CORBA::Exception *_alloc (void);
-      
+
       virtual CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
@@ -440,32 +440,32 @@ namespace PortableServer
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ctor.cpp:66
-      
+
       InvalidPolicy (
           CORBA::UShort _tao_index
         );
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:129
-      
+
       virtual CORBA::TypeCode_ptr _tao_type (void) const;
     };
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr const _tc_InvalidPolicy;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:53
 
@@ -473,24 +473,24 @@ namespace PortableServer
 
 #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 const NoServant *_downcast (CORBA::Exception const *);
-      
+
       static CORBA::Exception *_alloc (void);
-      
+
       virtual CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
@@ -499,25 +499,25 @@ namespace PortableServer
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:129
-      
+
       virtual CORBA::TypeCode_ptr _tao_type (void) const;
     };
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr const _tc_NoServant;
 
 #endif /* end #if !defined */
-    
+
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
     // TAO_IDL - Generated from
@@ -525,24 +525,24 @@ namespace PortableServer
 
 #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 const ObjectAlreadyActive *_downcast (CORBA::Exception const *);
-      
+
       static CORBA::Exception *_alloc (void);
-      
+
       virtual CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
@@ -551,48 +551,48 @@ namespace PortableServer
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:129
-      
+
       virtual CORBA::TypeCode_ptr _tao_type (void) const;
     };
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr const _tc_ObjectAlreadyActive;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:53
 
 #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 const ObjectNotActive *_downcast (CORBA::Exception const *);
-      
+
       static CORBA::Exception *_alloc (void);
-      
+
       virtual CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
@@ -601,48 +601,48 @@ namespace PortableServer
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:129
-      
+
       virtual CORBA::TypeCode_ptr _tao_type (void) const;
     };
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr const _tc_ObjectNotActive;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:53
 
 #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 const ServantAlreadyActive *_downcast (CORBA::Exception const *);
-      
+
       static CORBA::Exception *_alloc (void);
-      
+
       virtual CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
@@ -651,48 +651,48 @@ namespace PortableServer
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:129
-      
+
       virtual CORBA::TypeCode_ptr _tao_type (void) const;
     };
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr const _tc_ServantAlreadyActive;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:53
 
 #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 const ServantNotActive *_downcast (CORBA::Exception const *);
-      
+
       static CORBA::Exception *_alloc (void);
-      
+
       virtual CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
@@ -701,48 +701,48 @@ namespace PortableServer
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:129
-      
+
       virtual CORBA::TypeCode_ptr _tao_type (void) const;
     };
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr const _tc_ServantNotActive;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:53
 
 #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 const WrongAdapter *_downcast (CORBA::Exception const *);
-      
+
       static CORBA::Exception *_alloc (void);
-      
+
       virtual CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
@@ -751,48 +751,48 @@ namespace PortableServer
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:129
-      
+
       virtual CORBA::TypeCode_ptr _tao_type (void) const;
     };
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr const _tc_WrongAdapter;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:53
 
 #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 const WrongPolicy *_downcast (CORBA::Exception const *);
-      
+
       static CORBA::Exception *_alloc (void);
-      
+
       virtual CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
@@ -801,28 +801,28 @@ namespace PortableServer
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:129
-      
+
       virtual CORBA::TypeCode_ptr _tao_type (void) const;
     };
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr const _tc_WrongPolicy;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::POA_ptr create_POA (
         const char * adapter_name,
         ::PortableServer::POAManager_ptr a_POAManager,
@@ -834,10 +834,10 @@ namespace PortableServer
         ::PortableServer::POA::AdapterAlreadyExists,
         ::PortableServer::POA::InvalidPolicy
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::POA_ptr find_POA (
         const char * adapter_name,
         ::CORBA::Boolean activate_it
@@ -847,10 +847,10 @@ namespace PortableServer
         CORBA::SystemException,
         ::PortableServer::POA::AdapterNonExistent
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void destroy (
         ::CORBA::Boolean etherealize_objects,
         ::CORBA::Boolean wait_for_completion
@@ -859,10 +859,10 @@ namespace PortableServer
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
 #if (TAO_HAS_MINIMUM_POA == 0)
     virtual ::PortableServer::ThreadPolicy_ptr create_thread_policy (
         ::PortableServer::ThreadPolicyValue value
@@ -872,10 +872,10 @@ namespace PortableServer
         CORBA::SystemException
       )) = 0;
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::LifespanPolicy_ptr create_lifespan_policy (
         ::PortableServer::LifespanPolicyValue value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -883,10 +883,10 @@ namespace PortableServer
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // 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
@@ -894,10 +894,10 @@ namespace PortableServer
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // 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
@@ -905,10 +905,10 @@ namespace PortableServer
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
 #if (TAO_HAS_MINIMUM_POA == 0)
     virtual ::PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (
         ::PortableServer::ImplicitActivationPolicyValue value
@@ -918,10 +918,10 @@ namespace PortableServer
         CORBA::SystemException
       )) = 0;
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
 #if (TAO_HAS_MINIMUM_POA == 0)
     virtual ::PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (
         ::PortableServer::ServantRetentionPolicyValue value
@@ -931,10 +931,10 @@ namespace PortableServer
         CORBA::SystemException
       )) = 0;
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
 #if (TAO_HAS_MINIMUM_POA == 0)
     virtual ::PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (
         ::PortableServer::RequestProcessingPolicyValue value
@@ -944,50 +944,50 @@ namespace PortableServer
         CORBA::SystemException
       )) = 0;
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
-    
+
     // TAO_IDL - Generated from
     // 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
     // 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
     // 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
     // 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;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
 #if (TAO_HAS_MINIMUM_POA == 0)
 
     virtual ::PortableServer::AdapterActivator_ptr the_activator (
@@ -996,10 +996,10 @@ namespace PortableServer
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void the_activator (
         ::PortableServer::AdapterActivator_ptr the_activator
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1008,10 +1008,10 @@ namespace PortableServer
         CORBA::SystemException
       )) = 0;
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
 #if (TAO_HAS_MINIMUM_POA == 0)
     virtual ::PortableServer::ServantManager_ptr get_servant_manager (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1020,10 +1020,10 @@ namespace PortableServer
         CORBA::SystemException,
         ::PortableServer::POA::WrongPolicy
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void set_servant_manager (
         ::PortableServer::ServantManager_ptr imgr
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1033,10 +1033,10 @@ namespace PortableServer
         ::PortableServer::POA::WrongPolicy
       )) = 0;
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
 #if (TAO_HAS_MINIMUM_POA == 0)
 
     virtual ::PortableServer::Servant get_servant (
@@ -1047,10 +1047,10 @@ namespace PortableServer
         ::PortableServer::POA::NoServant,
         ::PortableServer::POA::WrongPolicy
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void set_servant (
         ::PortableServer::Servant p_servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1059,12 +1059,12 @@ namespace PortableServer
         CORBA::SystemException,
         ::PortableServer::POA::WrongPolicy
       )) = 0;
-    
+
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::ObjectId * activate_object (
         ::PortableServer::Servant p_servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1074,10 +1074,10 @@ namespace PortableServer
         ::PortableServer::POA::ServantAlreadyActive,
         ::PortableServer::POA::WrongPolicy
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void activate_object_with_id (
         const ::PortableServer::ObjectId & id,
         ::PortableServer::Servant p_servant
@@ -1089,10 +1089,10 @@ namespace PortableServer
         ::PortableServer::POA::ObjectAlreadyActive,
         ::PortableServer::POA::WrongPolicy
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void deactivate_object (
         const ::PortableServer::ObjectId & oid
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1102,10 +1102,10 @@ namespace PortableServer
         ::PortableServer::POA::ObjectNotActive,
         ::PortableServer::POA::WrongPolicy
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Object_ptr create_reference (
         const char * intf
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1114,10 +1114,10 @@ namespace PortableServer
         CORBA::SystemException,
         ::PortableServer::POA::WrongPolicy
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Object_ptr create_reference_with_id (
         const ::PortableServer::ObjectId & oid,
         const char * intf
@@ -1126,10 +1126,10 @@ namespace PortableServer
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::ObjectId * servant_to_id (
         ::PortableServer::Servant p_servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1139,10 +1139,10 @@ namespace PortableServer
         ::PortableServer::POA::ServantNotActive,
         ::PortableServer::POA::WrongPolicy
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // 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
@@ -1152,10 +1152,10 @@ namespace PortableServer
         ::PortableServer::POA::ServantNotActive,
         ::PortableServer::POA::WrongPolicy
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::Servant reference_to_servant (
         ::CORBA::Object_ptr reference
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1166,10 +1166,10 @@ namespace PortableServer
         ::PortableServer::POA::WrongAdapter,
         ::PortableServer::POA::WrongPolicy
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::ObjectId * reference_to_id (
         ::CORBA::Object_ptr reference
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1179,10 +1179,10 @@ namespace PortableServer
         ::PortableServer::POA::WrongAdapter,
         ::PortableServer::POA::WrongPolicy
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::Servant id_to_servant (
         const ::PortableServer::ObjectId & oid
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1192,10 +1192,10 @@ namespace PortableServer
         ::PortableServer::POA::ObjectNotActive,
         ::PortableServer::POA::WrongPolicy
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // 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
@@ -1205,46 +1205,46 @@ namespace PortableServer
         ::PortableServer::POA::ObjectNotActive,
         ::PortableServer::POA::WrongPolicy
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // 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;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     POA (void);
-    
+
     virtual ~POA (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     POA (const POA &);
-    
+
     void operator= (const POA &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_POA;
 
 // TAO_IDL - Generated from
@@ -1259,9 +1259,9 @@ namespace PortableServer
 namespace TAO
 {
 
-#if !defined (_PORTABLESERVER_POAMANAGER__TRAITS_CH_)
-#define _PORTABLESERVER_POAMANAGER__TRAITS_CH_
-  
+#if !defined (_PORTABLESERVER_POAMANAGER__TRAITS_)
+#define _PORTABLESERVER_POAMANAGER__TRAITS_
+
   template<>
   struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::POAManager>
   {
@@ -1280,9 +1280,9 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_PORTABLESERVER_ADAPTERACTIVATOR__TRAITS_CH_)
-#define _PORTABLESERVER_ADAPTERACTIVATOR__TRAITS_CH_
-  
+#if !defined (_PORTABLESERVER_ADAPTERACTIVATOR__TRAITS_)
+#define _PORTABLESERVER_ADAPTERACTIVATOR__TRAITS_
+
   template<>
   struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::AdapterActivator>
   {
@@ -1301,9 +1301,9 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_PORTABLESERVER_SERVANTMANAGER__TRAITS_CH_)
-#define _PORTABLESERVER_SERVANTMANAGER__TRAITS_CH_
-  
+#if !defined (_PORTABLESERVER_SERVANTMANAGER__TRAITS_)
+#define _PORTABLESERVER_SERVANTMANAGER__TRAITS_
+
   template<>
   struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::ServantManager>
   {
@@ -1322,9 +1322,9 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_PORTABLESERVER_POA__TRAITS_CH_)
-#define _PORTABLESERVER_POA__TRAITS_CH_
-  
+#if !defined (_PORTABLESERVER_POA__TRAITS_)
+#define _PORTABLESERVER_POA__TRAITS_
+
   template<>
   struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::POA>
   {
diff --git a/TAO/tao/PortableServer/PortableServerS.h b/TAO/tao/PortableServer/PortableServerS.h
index c52e7d0ecc5..5b1c718ab1c 100644
--- a/TAO/tao/PortableServer/PortableServerS.h
+++ b/TAO/tao/PortableServer/PortableServerS.h
@@ -1,11 +1,76 @@
-/*  @file PortableServerS.h
- *
- * $Id$
- *
- *  @author Matt Murphy <murphym@cs.uri.edu>
- *
- *  This file is here and is empty because code generated from pidl files with
- *  local interfaces incorrectly includes this file.  It is not needed but
- *  will caouse compile errors with local interface generated code.
- *
- */
+// -*- 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/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:373
+
+#ifndef _TAO_IDL_PORTABLESERVERS_H_
+#define _TAO_IDL_PORTABLESERVERS_H_
+
+#include /**/ "ace/pre.h"
+
+#include "PortableServerC.h"
+#include "tao/Policy_ForwardS.h"
+#include "tao/OctetSeqS.h"
+#include "tao/orb_typesS.h"
+#include "tao/PortableServer/PS_ForwardS.h"
+#include "tao/PortableServer/IdAssignmentPolicyS.h"
+#include "tao/PortableServer/IdUniquenessPolicyS.h"
+#include "tao/PortableServer/ImplicitActivationPolicyS.h"
+#include "tao/PortableServer/LifespanPolicyS.h"
+#include "tao/PortableServer/RequestProcessingPolicyS.h"
+#include "tao/PortableServer/ServantRetentionPolicyS.h"
+#include "tao/PortableServer/ThreadPolicyS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_sh.cpp:49
+
+namespace POA_PortableServer
+{
+  
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_sh.cpp:80
+
+} // module PortableServer
+
+// TAO_IDL - Generated from 
+// be\be_codegen.cpp:1060
+
+
+#if defined (__ACE_INLINE__)
+#include "PortableServerS.inl"
+#endif /* defined INLINE */
+
+#include /**/ "ace/post.h"
+#endif /* ifndef */
+
diff --git a/TAO/tao/PortableServer/PortableServer_includeA.h b/TAO/tao/PortableServer/PortableServer_includeA.h
new file mode 100644
index 00000000000..2874993878d
--- /dev/null
+++ b/TAO/tao/PortableServer/PortableServer_includeA.h
@@ -0,0 +1,44 @@
+// -*- 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/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:390
+
+#ifndef _TAO_IDL_ORIG_PORTABLESERVER_INCLUDEA_H_
+#define _TAO_IDL_ORIG_PORTABLESERVER_INCLUDEA_H_
+
+#include /**/ "ace/pre.h"
+
+#include "tao/PortableServer/PortableServer_includeC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "ace/post.h"
+#endif /* ifndef */
+
diff --git a/TAO/tao/PortableServer/PortableServer_includeC.h b/TAO/tao/PortableServer/PortableServer_includeC.h
index 38649c85687..152ccaf4f6a 100644
--- a/TAO/tao/PortableServer/PortableServer_includeC.h
+++ b/TAO/tao/PortableServer/PortableServer_includeC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_PORTABLESERVER_INCLUDEC_H_
-#define _TAO_IDL_ORIG_PORTABLESERVER_INCLUDEC_H_
+#ifndef _TAO_IDL_PORTABLESERVER_INCLUDEC_H_
+#define _TAO_IDL_PORTABLESERVER_INCLUDEC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -52,15 +52,6 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PortableServer_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#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
 // be\be_visitor_traits.cpp:61
 
@@ -70,15 +61,7 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+// be\be_codegen.cpp:1028
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PortableServer/PortableServer_includeS.h b/TAO/tao/PortableServer/PortableServer_includeS.h
index ef06f9a4ce2..17b1360599e 100644
--- a/TAO/tao/PortableServer/PortableServer_includeS.h
+++ b/TAO/tao/PortableServer/PortableServer_includeS.h
@@ -25,43 +25,4 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:390
-
-#ifndef _TAO_IDL_ORIG_PORTABLESERVER_INCLUDES_H_
-#define _TAO_IDL_ORIG_PORTABLESERVER_INCLUDES_H_
-
-#include /**/ "ace/pre.h"
-
-#include "tao/PortableServer/PortableServerS.h"
-#include "PortableServer_includeC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#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
-// be\be_codegen.cpp:997
-
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-#endif /* ifndef */
-
+// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp b/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp
index 7abf259932d..542527f8a7b 100644
--- a/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp
@@ -25,16 +25,16 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "RequestProcessingPolicyC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Enum_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
+#include "RequestProcessingPolicyA.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Enum_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Basic_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Basic_Impl_T.h"
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
@@ -112,79 +112,4 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::RequestProcessingPolicy>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::RequestProcessingPolicy>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::RequestProcessingPolicy>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// 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
-    );
-}
-
-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
-      );
-}
-
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/RequestProcessingPolicyA.h b/TAO/tao/PortableServer/RequestProcessingPolicyA.h
new file mode 100644
index 00000000000..a00d7522145
--- /dev/null
+++ b/TAO/tao/PortableServer/RequestProcessingPolicyA.h
@@ -0,0 +1,70 @@
+// -*- 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/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:754
+
+#ifndef _TAO_IDL_REQUESTPROCESSINGPOLICYA_H_
+#define _TAO_IDL_REQUESTPROCESSINGPOLICYA_H_
+
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+#include "RequestProcessingPolicyC.h"
+#include "tao/AnyTypeCode/PolicyA.h"
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:59
+
+namespace PortableServer
+{
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
+  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_RequestProcessingPolicyValue;
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
+  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_RequestProcessingPolicy;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:86
+
+} // module PortableServer
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::RequestProcessingPolicyValue);
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::RequestProcessingPolicyValue &);
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
diff --git a/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp b/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp
index 0cf4d5d6df0..c33d79df47f 100644
--- a/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp
@@ -26,17 +26,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
 #include "RequestProcessingPolicyC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
@@ -90,14 +86,6 @@ PortableServer::RequestProcessingPolicy::RequestProcessingPolicy (void)
 PortableServer::RequestProcessingPolicy::~RequestProcessingPolicy (void)
 {}
 
-void 
-PortableServer::RequestProcessingPolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  RequestProcessingPolicy *_tao_tmp_pointer =
-    static_cast<RequestProcessingPolicy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
 PortableServer::RequestProcessingPolicy_ptr
 PortableServer::RequestProcessingPolicy::_narrow (
     CORBA::Object_ptr _tao_objref
diff --git a/TAO/tao/PortableServer/RequestProcessingPolicyC.h b/TAO/tao/PortableServer/RequestProcessingPolicyC.h
index 467d161657d..6cb0d952943 100644
--- a/TAO/tao/PortableServer/RequestProcessingPolicyC.h
+++ b/TAO/tao/PortableServer/RequestProcessingPolicyC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_REQUESTPROCESSINGPOLICYC_H_
-#define _TAO_IDL_ORIG_REQUESTPROCESSINGPOLICYC_H_
+#ifndef _TAO_IDL_REQUESTPROCESSINGPOLICYC_H_
+#define _TAO_IDL_REQUESTPROCESSINGPOLICYC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -54,54 +54,40 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PortableServer_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#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
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace PortableServer
 {
-  
+
   // TAO_IDL - Generated from
   // 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
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_RequestProcessingPolicyValue;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY__VAR_OUT_CH_)
 #define _PORTABLESERVER_REQUESTPROCESSINGPOLICY__VAR_OUT_CH_
-  
+
   class RequestProcessingPolicy;
   typedef RequestProcessingPolicy *RequestProcessingPolicy_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         RequestProcessingPolicy
       >
     RequestProcessingPolicy_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         RequestProcessingPolicy
@@ -109,121 +95,116 @@ namespace PortableServer
     RequestProcessingPolicy_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY_CH_)
 #define _PORTABLESERVER_REQUESTPROCESSINGPOLICY_CH_
-  
+
   class TAO_PortableServer_Export RequestProcessingPolicy
     : public virtual ::CORBA::Policy
   {
   public:
     typedef RequestProcessingPolicy_ptr _ptr_type;
     typedef RequestProcessingPolicy_var _var_type;
-    
+
     // The static operations.
     static RequestProcessingPolicy_ptr _duplicate (RequestProcessingPolicy_ptr obj);
-    
+
     static void _tao_release (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 static_cast<RequestProcessingPolicy_ptr> (0);
     }
-    
-    static void _tao_any_destructor (void *);
-    
+
+
+
     // TAO_IDL - Generated from
     // 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
     // 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
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // 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
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     RequestProcessingPolicy (void);
-    
+
     virtual ~RequestProcessingPolicy (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     RequestProcessingPolicy (const RequestProcessingPolicy &);
-    
+
     void operator= (const RequestProcessingPolicy &);
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_RequestProcessingPolicy;
 
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module PortableServer
 
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
 // TAO_IDL - Generated from
 // be\be_visitor_traits.cpp:61
 
+#if (TAO_HAS_MINIMUM_POA == 0)
+
 // Traits specializations.
 namespace TAO
 {
 
-#if (TAO_HAS_MINIMUM_POA == 0)
+#if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY__TRAITS_)
+#define _PORTABLESERVER_REQUESTPROCESSINGPOLICY__TRAITS_
 
-#if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY__TRAITS_CH_)
-#define _PORTABLESERVER_REQUESTPROCESSINGPOLICY__TRAITS_CH_
-  
   template<>
   struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::RequestProcessingPolicy>
   {
@@ -241,27 +222,9 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_ch.cpp:51
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::RequestProcessingPolicyValue);
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::RequestProcessingPolicyValue &);
-
-// TAO_IDL - Generated from
-// 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
 // be\be_visitor_enum/cdr_op_ch.cpp:50
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, PortableServer::RequestProcessingPolicyValue);
@@ -270,15 +233,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableSer
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+// be\be_codegen.cpp:1028
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp
index fa1c2d85b29..1d5954cd800 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp
@@ -252,7 +252,7 @@ namespace TAO
           // upcall.
           TAO::Portable_Server::POA_Current_Impl *poa_current_impl =
             static_cast <TAO::Portable_Server::POA_Current_Impl *>
-                        (TAO_TSS_RESOURCES::instance ()->poa_current_impl_);
+                        (TAO_TSS_Resources::instance ()->poa_current_impl_);
           // If we are in an upcall on the default servant, return the
           // ObjectId associated with the current invocation.
           if (poa_current_impl != 0 &&
diff --git a/TAO/tao/PortableServer/Root_POA.cpp b/TAO/tao/PortableServer/Root_POA.cpp
index e3413f94fea..bf155ab378d 100644
--- a/TAO/tao/PortableServer/Root_POA.cpp
+++ b/TAO/tao/PortableServer/Root_POA.cpp
@@ -1295,7 +1295,7 @@ TAO_Root_POA::check_for_valid_wait_for_completions (const TAO_ORB_Core &orb_core
     {
       TAO::Portable_Server::POA_Current_Impl *poa_current_impl =
         static_cast <TAO::Portable_Server::POA_Current_Impl *>
-                    (TAO_TSS_RESOURCES::instance ()->poa_current_impl_);
+                    (TAO_TSS_Resources::instance ()->poa_current_impl_);
 
       while (1)
         {
diff --git a/TAO/tao/PortableServer/SArg_Traits_T.h b/TAO/tao/PortableServer/SArg_Traits_T.h
new file mode 100644
index 00000000000..4287b2d2765
--- /dev/null
+++ b/TAO/tao/PortableServer/SArg_Traits_T.h
@@ -0,0 +1,38 @@
+// This may look like C, but it's really -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    SArg_Traits_T.h
+ *
+ *  $Id$
+ *
+ *  @authors Jeff Parsons and Carlos O'Ryan
+ */
+//=============================================================================
+
+
+#ifndef TAO_SARG_TRAITS_T_H
+#define TAO_SARG_TRAITS_T_H
+
+#include /**/ "ace/pre.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+namespace TAO
+{
+  /**
+   *
+   * @brief Base class for all skeleton arg traits specializations.
+   *
+   */
+  template<typename T>
+  class SArg_Traits
+  {
+  };
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* TAO_SARG_TRAITS_T_H */
diff --git a/TAO/tao/PortableServer/ServantActivatorA.cpp b/TAO/tao/PortableServer/ServantActivatorA.cpp
index a0db16f7902..95230e368af 100644
--- a/TAO/tao/PortableServer/ServantActivatorA.cpp
+++ b/TAO/tao/PortableServer/ServantActivatorA.cpp
@@ -25,14 +25,14 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "ServantActivatorC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
+#include "ServantActivatorA.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
@@ -45,88 +45,11 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/PortableServer/ServantActivator:2.3",
     "ServantActivator");
-  
+
 namespace PortableServer
 {
   ::CORBA::TypeCode_ptr const _tc_ServantActivator =
     &_tao_tc_PortableServer_ServantActivator;
 }
 
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ServantActivator>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ServantActivator>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ServantActivator>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// 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
-      );
-}
-
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/ServantActivatorA.h b/TAO/tao/PortableServer/ServantActivatorA.h
new file mode 100644
index 00000000000..da5bc2387bf
--- /dev/null
+++ b/TAO/tao/PortableServer/ServantActivatorA.h
@@ -0,0 +1,61 @@
+// -*- 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/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:754
+
+#ifndef _TAO_IDL_SERVANTACTIVATORA_H_
+#define _TAO_IDL_SERVANTACTIVATORA_H_
+
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+#include "ServantActivatorC.h"
+#include "tao/PortableServer/PS_ForwardA.h"
+#include "tao/PortableServer/ServantManagerA.h"
+#include "tao/PortableServer/ForwardRequestA.h"
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:59
+
+namespace PortableServer
+{
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
+  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ServantActivator;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:86
+
+} // module PortableServer
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
diff --git a/TAO/tao/PortableServer/ServantActivatorC.cpp b/TAO/tao/PortableServer/ServantActivatorC.cpp
index 22d57868f4b..2a2333d0567 100644
--- a/TAO/tao/PortableServer/ServantActivatorC.cpp
+++ b/TAO/tao/PortableServer/ServantActivatorC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
 #include "ServantActivatorC.h"
@@ -34,10 +34,6 @@
 #include "tao/ORB_Core.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
@@ -91,14 +87,6 @@ PortableServer::ServantActivator::ServantActivator (void)
 PortableServer::ServantActivator::~ServantActivator (void)
 {}
 
-void 
-PortableServer::ServantActivator::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ServantActivator *_tao_tmp_pointer =
-    static_cast<ServantActivator *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
 PortableServer::ServantActivator_ptr
 PortableServer::ServantActivator::_narrow (
     CORBA::Object_ptr _tao_objref
diff --git a/TAO/tao/PortableServer/ServantActivatorC.h b/TAO/tao/PortableServer/ServantActivatorC.h
index 64de4071d28..53e28b18c8a 100644
--- a/TAO/tao/PortableServer/ServantActivatorC.h
+++ b/TAO/tao/PortableServer/ServantActivatorC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_SERVANTACTIVATORC_H_
-#define _TAO_IDL_ORIG_SERVANTACTIVATORC_H_
+#ifndef _TAO_IDL_SERVANTACTIVATORC_H_
+#define _TAO_IDL_SERVANTACTIVATORC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -56,17 +56,8 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PortableServer_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#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
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
@@ -129,7 +120,7 @@ namespace PortableServer
       return static_cast<ServantActivator_ptr> (0);
     }
     
-    static void _tao_any_destructor (void *);
+    
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -184,14 +175,9 @@ namespace PortableServer
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ServantActivator;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module PortableServer
 
@@ -202,8 +188,8 @@ namespace PortableServer
 namespace TAO
 {
 
-#if !defined (_PORTABLESERVER_SERVANTACTIVATOR__TRAITS_CH_)
-#define _PORTABLESERVER_SERVANTACTIVATOR__TRAITS_CH_
+#if !defined (_PORTABLESERVER_SERVANTACTIVATOR__TRAITS_)
+#define _PORTABLESERVER_SERVANTACTIVATOR__TRAITS_
   
   template<>
   struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::ServantActivator>
@@ -224,25 +210,10 @@ namespace TAO
 #endif /* end #if !defined */
 }
 
-// TAO_IDL - Generated from
-// 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 &);
-
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+// be\be_codegen.cpp:1028
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PortableServer/ServantLocatorA.cpp b/TAO/tao/PortableServer/ServantLocatorA.cpp
index 83257e5771f..fed82639ced 100644
--- a/TAO/tao/PortableServer/ServantLocatorA.cpp
+++ b/TAO/tao/PortableServer/ServantLocatorA.cpp
@@ -25,15 +25,15 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "ServantLocatorC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
+#include "ServantLocatorA.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
@@ -46,88 +46,11 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/PortableServer/ServantLocator:2.3",
     "ServantLocator");
-  
+
 namespace PortableServer
 {
   ::CORBA::TypeCode_ptr const _tc_ServantLocator =
     &_tao_tc_PortableServer_ServantLocator;
 }
 
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ServantLocator>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ServantLocator>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ServantLocator>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// 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
-      );
-}
-
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/ServantLocatorA.h b/TAO/tao/PortableServer/ServantLocatorA.h
new file mode 100644
index 00000000000..223062154e4
--- /dev/null
+++ b/TAO/tao/PortableServer/ServantLocatorA.h
@@ -0,0 +1,62 @@
+// -*- 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/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:754
+
+#ifndef _TAO_IDL_SERVANTLOCATORA_H_
+#define _TAO_IDL_SERVANTLOCATORA_H_
+
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+#include "ServantLocatorC.h"
+#include "tao/AnyTypeCode/orb_typesA.h"
+#include "tao/PortableServer/PS_ForwardA.h"
+#include "tao/PortableServer/ServantManagerA.h"
+#include "tao/PortableServer/ForwardRequestA.h"
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:59
+
+namespace PortableServer
+{
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
+  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ServantLocator;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:86
+
+} // module PortableServer
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
diff --git a/TAO/tao/PortableServer/ServantLocatorC.cpp b/TAO/tao/PortableServer/ServantLocatorC.cpp
index b1a9623c479..e20acbb995d 100644
--- a/TAO/tao/PortableServer/ServantLocatorC.cpp
+++ b/TAO/tao/PortableServer/ServantLocatorC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
 #include "ServantLocatorC.h"
@@ -34,10 +34,6 @@
 #include "tao/ORB_Core.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
@@ -91,14 +87,6 @@ PortableServer::ServantLocator::ServantLocator (void)
 PortableServer::ServantLocator::~ServantLocator (void)
 {}
 
-void 
-PortableServer::ServantLocator::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ServantLocator *_tao_tmp_pointer =
-    static_cast<ServantLocator *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
 PortableServer::ServantLocator_ptr
 PortableServer::ServantLocator::_narrow (
     CORBA::Object_ptr _tao_objref
diff --git a/TAO/tao/PortableServer/ServantLocatorC.h b/TAO/tao/PortableServer/ServantLocatorC.h
index be2020ff060..d0333809f29 100644
--- a/TAO/tao/PortableServer/ServantLocatorC.h
+++ b/TAO/tao/PortableServer/ServantLocatorC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_SERVANTLOCATORC_H_
-#define _TAO_IDL_ORIG_SERVANTLOCATORC_H_
+#ifndef _TAO_IDL_SERVANTLOCATORC_H_
+#define _TAO_IDL_SERVANTLOCATORC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -57,17 +57,8 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PortableServer_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#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
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
@@ -132,7 +123,7 @@ namespace PortableServer
       return static_cast<ServantLocator_ptr> (0);
     }
     
-    static void _tao_any_destructor (void *);
+    
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -189,14 +180,9 @@ namespace PortableServer
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ServantLocator;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module PortableServer
 
@@ -207,8 +193,8 @@ namespace PortableServer
 namespace TAO
 {
 
-#if !defined (_PORTABLESERVER_SERVANTLOCATOR__TRAITS_CH_)
-#define _PORTABLESERVER_SERVANTLOCATOR__TRAITS_CH_
+#if !defined (_PORTABLESERVER_SERVANTLOCATOR__TRAITS_)
+#define _PORTABLESERVER_SERVANTLOCATOR__TRAITS_
   
   template<>
   struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::ServantLocator>
@@ -229,25 +215,10 @@ namespace TAO
 #endif /* end #if !defined */
 }
 
-// TAO_IDL - Generated from
-// 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 &);
-
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+// be\be_codegen.cpp:1028
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PortableServer/ServantManagerA.cpp b/TAO/tao/PortableServer/ServantManagerA.cpp
index d2d95363f7c..5f6d30238b9 100644
--- a/TAO/tao/PortableServer/ServantManagerA.cpp
+++ b/TAO/tao/PortableServer/ServantManagerA.cpp
@@ -25,14 +25,14 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "ServantManagerC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
+#include "ServantManagerA.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
@@ -45,88 +45,11 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/PortableServer/ServantManager:2.3",
     "ServantManager");
-  
+
 namespace PortableServer
 {
   ::CORBA::TypeCode_ptr const _tc_ServantManager =
     &_tao_tc_PortableServer_ServantManager;
 }
 
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ServantManager>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ServantManager>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ServantManager>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// 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
-      );
-}
-
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/ServantManagerA.h b/TAO/tao/PortableServer/ServantManagerA.h
new file mode 100644
index 00000000000..a3b630bc035
--- /dev/null
+++ b/TAO/tao/PortableServer/ServantManagerA.h
@@ -0,0 +1,58 @@
+// -*- 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/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:754
+
+#ifndef _TAO_IDL_SERVANTMANAGERA_H_
+#define _TAO_IDL_SERVANTMANAGERA_H_
+
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+#include "ServantManagerC.h"
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:59
+
+namespace PortableServer
+{
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
+  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ServantManager;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:86
+
+} // module PortableServer
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
diff --git a/TAO/tao/PortableServer/ServantManagerC.cpp b/TAO/tao/PortableServer/ServantManagerC.cpp
index da86770afba..a870d15bb09 100644
--- a/TAO/tao/PortableServer/ServantManagerC.cpp
+++ b/TAO/tao/PortableServer/ServantManagerC.cpp
@@ -26,17 +26,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
 #include "ServantManagerC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
@@ -89,14 +85,6 @@ PortableServer::ServantManager::ServantManager (void)
 PortableServer::ServantManager::~ServantManager (void)
 {}
 
-void 
-PortableServer::ServantManager::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ServantManager *_tao_tmp_pointer =
-    static_cast<ServantManager *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
 PortableServer::ServantManager_ptr
 PortableServer::ServantManager::_narrow (
     CORBA::Object_ptr _tao_objref
diff --git a/TAO/tao/PortableServer/ServantManagerC.h b/TAO/tao/PortableServer/ServantManagerC.h
index 564ed3ac737..bc6f82dc2ce 100644
--- a/TAO/tao/PortableServer/ServantManagerC.h
+++ b/TAO/tao/PortableServer/ServantManagerC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_SERVANTMANAGERC_H_
-#define _TAO_IDL_ORIG_SERVANTMANAGERC_H_
+#ifndef _TAO_IDL_SERVANTMANAGERC_H_
+#define _TAO_IDL_SERVANTMANAGERC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -51,17 +51,8 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PortableServer_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#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
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
@@ -124,7 +115,7 @@ namespace PortableServer
       return static_cast<ServantManager_ptr> (0);
     }
     
-    static void _tao_any_destructor (void *);
+    
     
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
@@ -151,14 +142,9 @@ namespace PortableServer
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ServantManager;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module PortableServer
 
@@ -169,8 +155,8 @@ namespace PortableServer
 namespace TAO
 {
 
-#if !defined (_PORTABLESERVER_SERVANTMANAGER__TRAITS_CH_)
-#define _PORTABLESERVER_SERVANTMANAGER__TRAITS_CH_
+#if !defined (_PORTABLESERVER_SERVANTMANAGER__TRAITS_)
+#define _PORTABLESERVER_SERVANTMANAGER__TRAITS_
   
   template<>
   struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::ServantManager>
@@ -191,25 +177,10 @@ namespace TAO
 #endif /* end #if !defined */
 }
 
-// TAO_IDL - Generated from
-// 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 &);
-
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+// be\be_codegen.cpp:1028
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PortableServer/ServantRetentionPolicyA.cpp b/TAO/tao/PortableServer/ServantRetentionPolicyA.cpp
index 1906815b004..70f4a4512e1 100644
--- a/TAO/tao/PortableServer/ServantRetentionPolicyA.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionPolicyA.cpp
@@ -25,16 +25,16 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "ServantRetentionPolicyC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Enum_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
+#include "ServantRetentionPolicyA.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Enum_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Basic_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Basic_Impl_T.h"
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
@@ -111,79 +111,4 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ServantRetentionPolicy>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ServantRetentionPolicy>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ServantRetentionPolicy>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// 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;
-}
-
-// 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
-    );
-}
-
-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
-      );
-}
-
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/ServantRetentionPolicyA.h b/TAO/tao/PortableServer/ServantRetentionPolicyA.h
new file mode 100644
index 00000000000..0ffcf36340c
--- /dev/null
+++ b/TAO/tao/PortableServer/ServantRetentionPolicyA.h
@@ -0,0 +1,70 @@
+// -*- 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/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:754
+
+#ifndef _TAO_IDL_SERVANTRETENTIONPOLICYA_H_
+#define _TAO_IDL_SERVANTRETENTIONPOLICYA_H_
+
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+#include "ServantRetentionPolicyC.h"
+#include "tao/AnyTypeCode/PolicyA.h"
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:59
+
+namespace PortableServer
+{
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
+  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ServantRetentionPolicyValue;
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
+  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ServantRetentionPolicy;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:86
+
+} // module PortableServer
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantRetentionPolicyValue);
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantRetentionPolicyValue &);
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
diff --git a/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp b/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp
index 4af9830fee6..a1593b6f7a5 100644
--- a/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp
@@ -26,17 +26,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
 #include "ServantRetentionPolicyC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
@@ -90,14 +86,6 @@ PortableServer::ServantRetentionPolicy::ServantRetentionPolicy (void)
 PortableServer::ServantRetentionPolicy::~ServantRetentionPolicy (void)
 {}
 
-void 
-PortableServer::ServantRetentionPolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ServantRetentionPolicy *_tao_tmp_pointer =
-    static_cast<ServantRetentionPolicy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
 PortableServer::ServantRetentionPolicy_ptr
 PortableServer::ServantRetentionPolicy::_narrow (
     CORBA::Object_ptr _tao_objref
diff --git a/TAO/tao/PortableServer/ServantRetentionPolicyC.h b/TAO/tao/PortableServer/ServantRetentionPolicyC.h
index 7e34b498328..5aac210495d 100644
--- a/TAO/tao/PortableServer/ServantRetentionPolicyC.h
+++ b/TAO/tao/PortableServer/ServantRetentionPolicyC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_SERVANTRETENTIONPOLICYC_H_
-#define _TAO_IDL_ORIG_SERVANTRETENTIONPOLICYC_H_
+#ifndef _TAO_IDL_SERVANTRETENTIONPOLICYC_H_
+#define _TAO_IDL_SERVANTRETENTIONPOLICYC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -54,53 +54,39 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PortableServer_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#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
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace PortableServer
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_enum/enum_ch.cpp:57
-  
+
   enum ServantRetentionPolicyValue
   {
     RETAIN,
     NON_RETAIN
   };
-  
+
 #if (TAO_HAS_MINIMUM_POA == 0)
   typedef ServantRetentionPolicyValue &ServantRetentionPolicyValue_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ServantRetentionPolicyValue;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY__VAR_OUT_CH_)
 #define _PORTABLESERVER_SERVANTRETENTIONPOLICY__VAR_OUT_CH_
-  
+
   class ServantRetentionPolicy;
   typedef ServantRetentionPolicy *ServantRetentionPolicy_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ServantRetentionPolicy
       >
     ServantRetentionPolicy_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ServantRetentionPolicy
@@ -108,105 +94,100 @@ namespace PortableServer
     ServantRetentionPolicy_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY_CH_)
 #define _PORTABLESERVER_SERVANTRETENTIONPOLICY_CH_
-  
+
   class TAO_PortableServer_Export ServantRetentionPolicy
     : public virtual ::CORBA::Policy
   {
   public:
     typedef ServantRetentionPolicy_ptr _ptr_type;
     typedef ServantRetentionPolicy_var _var_type;
-    
+
     // The static operations.
     static ServantRetentionPolicy_ptr _duplicate (ServantRetentionPolicy_ptr obj);
-    
+
     static void _tao_release (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 static_cast<ServantRetentionPolicy_ptr> (0);
     }
-    
-    static void _tao_any_destructor (void *);
-    
+
+
+
     // TAO_IDL - Generated from
     // 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
     // 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
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // 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
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     ServantRetentionPolicy (void);
-    
+
     virtual ~ServantRetentionPolicy (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     ServantRetentionPolicy (const ServantRetentionPolicy &);
-    
+
     void operator= (const ServantRetentionPolicy &);
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ServantRetentionPolicy;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
@@ -215,15 +196,15 @@ namespace PortableServer
 // TAO_IDL - Generated from
 // be\be_visitor_traits.cpp:61
 
+#if (TAO_HAS_MINIMUM_POA == 0)
+
 // Traits specializations.
 namespace TAO
 {
 
-#if (TAO_HAS_MINIMUM_POA == 0)
+#if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY__TRAITS_)
+#define _PORTABLESERVER_SERVANTRETENTIONPOLICY__TRAITS_
 
-#if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY__TRAITS_CH_)
-#define _PORTABLESERVER_SERVANTRETENTIONPOLICY__TRAITS_CH_
-  
   template<>
   struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::ServantRetentionPolicy>
   {
@@ -241,26 +222,9 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
-#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_ch.cpp:51
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantRetentionPolicyValue);
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantRetentionPolicyValue &);
-
-// TAO_IDL - Generated from
-// 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
 // be\be_visitor_enum/cdr_op_ch.cpp:50
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, PortableServer::ServantRetentionPolicyValue);
@@ -269,15 +233,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableSer
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+// be\be_codegen.cpp:1028
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp
index 3cd3e4e7508..1959e73cbef 100644
--- a/TAO/tao/PortableServer/Servant_Base.cpp
+++ b/TAO/tao/PortableServer/Servant_Base.cpp
@@ -153,7 +153,7 @@ TAO_ServantBase::_create_stub (ACE_ENV_SINGLE_ARG_DECL)
 
   TAO::Portable_Server::POA_Current_Impl *poa_current_impl =
     static_cast<TAO::Portable_Server::POA_Current_Impl *>
-                    (TAO_TSS_RESOURCES::instance ()->poa_current_impl_);
+                    (TAO_TSS_Resources::instance ()->poa_current_impl_);
 
   CORBA::ORB_ptr servant_orb = 0;
 
diff --git a/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp b/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp
index 956563d9ce3..991f39a5bab 100644
--- a/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp
@@ -4,7 +4,6 @@
 #define TAO_SPECIAL_BASIC_SARGUMENT_T_CPP
 
 #include "tao/PortableServer/Special_Basic_SArgument_T.h"
-#include "tao/Dynamic_ParameterC.h"
 
 #if !defined (__ACE_INLINE__)
 #include "tao/PortableServer/Special_Basic_SArgument_T.inl"
@@ -13,9 +12,12 @@
 
 // ============================================================
 
-template<typename S, typename to_S, typename from_S>
+template<typename S,
+         typename to_S,
+         typename from_S,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::In_Special_Basic_SArgument_T<S,to_S,from_S>::demarshal (
+TAO::In_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::demarshal (
     TAO_InputCDR & cdr
   )
 {
@@ -24,32 +26,39 @@ TAO::In_Special_Basic_SArgument_T<S,to_S,from_S>::demarshal (
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, typename to_S, typename from_S>
+template<typename S,
+         typename to_S,
+         typename from_S,
+         typename Insert_Policy>
 void
-TAO::In_Special_Basic_SArgument_T<S,to_S,from_S>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::In_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::
+interceptor_value (CORBA::Any *any) const
 {
-  p.argument <<= from_S (this->x_);
-  p.mode = CORBA::PARAM_IN;
+  this->Insert_Policy::any_insert (any, from_S (this->x_));
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ===========================================================
 
-template<typename S, typename to_S, typename from_S>
+template<typename S,
+         typename to_S,
+         typename from_S,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S>::marshal (
+TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::marshal (
     TAO_OutputCDR & cdr
   )
 {
   return cdr << from_S (this->x_);
 }
 
-template<typename S, typename to_S, typename from_S>
+template<typename S,
+         typename to_S,
+         typename from_S,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S>::demarshal (
+TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::demarshal (
     TAO_InputCDR & cdr
   )
 {
@@ -58,23 +67,27 @@ TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S>::demarshal (
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, typename to_S, typename from_S>
+template<typename S,
+         typename to_S,
+         typename from_S,
+         typename Insert_Policy>
 void
-TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::
+interceptor_value (CORBA::Any *any) const
 {
-  p.argument <<= from_S (this->x_);
-  p.mode = CORBA::PARAM_INOUT;
+  this->Insert_Policy::any_insert (any, from_S (this->x_));
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ==============================================================
 
-template<typename S, typename to_S, typename from_S>
+template<typename S,
+         typename to_S,
+         typename from_S,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Out_Special_Basic_SArgument_T<S,to_S,from_S>::marshal (
+TAO::Out_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::marshal (
     TAO_OutputCDR & cdr
   )
 {
@@ -83,23 +96,27 @@ TAO::Out_Special_Basic_SArgument_T<S,to_S,from_S>::marshal (
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, typename to_S, typename from_S>
+template<typename S,
+         typename to_S,
+         typename from_S,
+         typename Insert_Policy>
 void
-TAO::Out_Special_Basic_SArgument_T<S,to_S,from_S>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::Out_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::
+interceptor_value (CORBA::Any *any) const
 {
-  p.argument <<= from_S (this->x_);
-  p.mode = CORBA::PARAM_OUT;
+  this->Insert_Policy::any_insert (any, from_S (this->x_));
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ==============================================================
 
-template<typename S, typename to_S, typename from_S>
+template<typename S,
+         typename to_S,
+         typename from_S,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Ret_Special_Basic_SArgument_T<S,to_S,from_S>::marshal (
+TAO::Ret_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::marshal (
     TAO_OutputCDR & cdr
   )
 {
@@ -108,13 +125,15 @@ TAO::Ret_Special_Basic_SArgument_T<S,to_S,from_S>::marshal (
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, typename to_S, typename from_S>
+template<typename S,
+         typename to_S,
+         typename from_S,
+         typename Insert_Policy>
 void
-TAO::Ret_Special_Basic_SArgument_T<S,to_S,from_S>::interceptor_result (
-    CORBA::Any * any
-  )
+TAO::Ret_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::
+interceptor_value (CORBA::Any *any) const
 {
-  (*any) <<= from_S (this->x_);
+  this->Insert_Policy::any_insert (any, from_S (this->x_));
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
diff --git a/TAO/tao/PortableServer/Special_Basic_SArgument_T.h b/TAO/tao/PortableServer/Special_Basic_SArgument_T.h
index 3e3499ced40..e7d34f8494b 100644
--- a/TAO/tao/PortableServer/Special_Basic_SArgument_T.h
+++ b/TAO/tao/PortableServer/Special_Basic_SArgument_T.h
@@ -30,15 +30,18 @@ namespace TAO
    * @brief Template class for IN skeleton argument of (w)char/boolean/octet.
    *
    */
-  template<typename S, typename to_S, typename from_S>
-  class In_Special_Basic_SArgument_T : public Argument
+  template<typename S,
+           typename to_S,
+           typename from_S,
+           typename Insert_Policy>
+  class In_Special_Basic_SArgument_T : public InArgument, private Insert_Policy
   {
   public:
     In_Special_Basic_SArgument_T (void);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S const & arg (void) const;
 
@@ -52,16 +55,19 @@ namespace TAO
    * @brief Template class for INOUT (w)char/boolean/octet skeleton argument.
    *
    */
-  template<typename S, typename to_S, typename from_S>
-  class Inout_Special_Basic_SArgument_T : public Argument
+  template<typename S,
+           typename to_S,
+           typename from_S,
+           typename Insert_Policy>
+  class Inout_Special_Basic_SArgument_T : public InoutArgument, private Insert_Policy
   {
   public:
     Inout_Special_Basic_SArgument_T (void);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S & arg (void);
 
@@ -75,15 +81,18 @@ namespace TAO
    * @brief Template class for OUT skeleton argument of (w)char/boolean/octet.
    *
    */
-  template<typename S, typename to_S, typename from_S>
-  class Out_Special_Basic_SArgument_T : public Argument
+  template<typename S,
+           typename to_S,
+           typename from_S,
+           typename Insert_Policy>
+  class Out_Special_Basic_SArgument_T : public OutArgument, private Insert_Policy
   {
   public:
     Out_Special_Basic_SArgument_T (void);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S & arg (void);
 
@@ -97,15 +106,18 @@ namespace TAO
    * @brief Template class for return skeleton value of (w)char/boolean/octet.
    *
    */
-  template<typename S, typename to_S, typename from_S>
-  class Ret_Special_Basic_SArgument_T : public Argument
+  template<typename S,
+           typename to_S,
+           typename from_S,
+           typename Insert_Policy>
+  class Ret_Special_Basic_SArgument_T : public RetArgument, private Insert_Policy
   {
   public:
     Ret_Special_Basic_SArgument_T (void);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_result (CORBA::Any *);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S & arg (void);
 
@@ -114,13 +126,13 @@ namespace TAO
   };
 
   /**
-   * @struct Special_Basic_Traits_T
+   * @struct Special_Basic_SArg_Traits_T
    *
    * @brief Template class for skeleton argument traits
    *  of (w)char/boolean/octet.
    *
    */
-  template<typename T, typename to_T, typename from_T>
+  template<typename T, typename to_T, typename from_T, typename Insert_Policy>
   struct Special_Basic_SArg_Traits_T
   {
     typedef T                                               ret_type;
@@ -128,10 +140,10 @@ namespace TAO
     typedef T &                                             inout_type;
     typedef T &                                             out_type;
 
-    typedef In_Special_Basic_SArgument_T<T,to_T,from_T>     in_arg_val;
-    typedef Inout_Special_Basic_SArgument_T<T,to_T,from_T>  inout_arg_val;
-    typedef Out_Special_Basic_SArgument_T<T,to_T,from_T>    out_arg_val;
-    typedef Ret_Special_Basic_SArgument_T<T,to_T,from_T>    ret_val;
+    typedef In_Special_Basic_SArgument_T<T,to_T,from_T,Insert_Policy>     in_arg_val;
+    typedef Inout_Special_Basic_SArgument_T<T,to_T,from_T,Insert_Policy>  inout_arg_val;
+    typedef Out_Special_Basic_SArgument_T<T,to_T,from_T,Insert_Policy>    out_arg_val;
+    typedef Ret_Special_Basic_SArgument_T<T,to_T,from_T,Insert_Policy>    ret_val;
 
     // Typedefs corresponding to return value of arg() method in both
     // the client and server side argument class templates.
diff --git a/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl b/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl
index a0fd902d4fd..38d18635683 100644
--- a/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl
+++ b/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl
@@ -2,64 +2,91 @@
 //
 // $Id$
 
-template<typename S, typename to_S, typename from_S>
+template<typename S,
+         typename to_S,
+         typename from_S,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::In_Special_Basic_SArgument_T<S,to_S,from_S>::
+TAO::In_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::
 In_Special_Basic_SArgument_T (void)
-{}
+{
+}
 
-template<typename S, typename to_S, typename from_S>
+template<typename S,
+         typename to_S,
+         typename from_S,
+         typename Insert_Policy>
 ACE_INLINE
 S const &
-TAO::In_Special_Basic_SArgument_T<S,to_S,from_S>::arg (void) const
+TAO::In_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::arg (void) const
 {
   return this->x_;
 }
 
 // ===========================================================================
 
-template<typename S, typename to_S, typename from_S>
+template<typename S,
+         typename to_S,
+         typename from_S,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S>::
+TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::
 Inout_Special_Basic_SArgument_T (void)
-{}
+{
+}
 
-template<typename S, typename to_S, typename from_S>
+template<typename S,
+         typename to_S,
+         typename from_S,
+         typename Insert_Policy>
 ACE_INLINE
 S &
-TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S>::arg (void)
+TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::arg (void)
 {
   return this->x_;
 }
 
 // ===========================================================================
 
-template<typename S, typename to_S, typename from_S>
+template<typename S,
+         typename to_S,
+         typename from_S,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Out_Special_Basic_SArgument_T<S,to_S,from_S>::
+TAO::Out_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::
 Out_Special_Basic_SArgument_T (void)
-{}
+{
+}
 
-template<typename S, typename to_S, typename from_S>
+template<typename S,
+         typename to_S,
+         typename from_S,
+         typename Insert_Policy>
 S &
-TAO::Out_Special_Basic_SArgument_T<S,to_S,from_S>::arg (void)
+TAO::Out_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::arg (void)
 {
   return this->x_;
 }
 
 // ===========================================================================
 
-template<typename S, typename to_S, typename from_S>
+template<typename S,
+         typename to_S,
+         typename from_S,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Ret_Special_Basic_SArgument_T<S,to_S,from_S>::
+TAO::Ret_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::
 Ret_Special_Basic_SArgument_T (void)
 {
 }
 
-template<typename S, typename to_S, typename from_S>
+template<typename S,
+         typename to_S,
+         typename from_S,
+         typename Insert_Policy>
 ACE_INLINE
 S &
-TAO::Ret_Special_Basic_SArgument_T<S,to_S,from_S>::arg (void)
+TAO::Ret_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::arg (void)
 {
   return this->x_;
 }
diff --git a/TAO/tao/PortableServer/Special_Basic_SArguments.h b/TAO/tao/PortableServer/Special_Basic_SArguments.h
index 80ff01a5331..29708781603 100644
--- a/TAO/tao/PortableServer/Special_Basic_SArguments.h
+++ b/TAO/tao/PortableServer/Special_Basic_SArguments.h
@@ -23,7 +23,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/PortableServer/Special_Basic_SArgument_T.h"
-#include "tao/Arg_Traits_T.h"
+#include "tao/PortableServer/SArg_Traits_T.h"
 
 #include "ace/CDR_Stream.h"
 
@@ -40,7 +40,8 @@ namespace TAO
   class TAO_PortableServer_Export SArg_Traits<ACE_InputCDR::to_char>
     : public Special_Basic_SArg_Traits_T<CORBA::Char,
                                          ACE_InputCDR::to_char,
-                                         ACE_OutputCDR::from_char>
+                                         ACE_OutputCDR::from_char,
+                                         TAO::Any_Insert_Policy_Stream <ACE_OutputCDR::from_char> >
   {
   };
 
@@ -48,7 +49,8 @@ namespace TAO
   class TAO_PortableServer_Export SArg_Traits<ACE_InputCDR::to_wchar>
     : public Special_Basic_SArg_Traits_T<CORBA::WChar,
                                          ACE_InputCDR::to_wchar,
-                                         ACE_OutputCDR::from_wchar>
+                                         ACE_OutputCDR::from_wchar,
+                                         TAO::Any_Insert_Policy_Stream <ACE_OutputCDR::from_wchar> >
   {
   };
 
@@ -56,7 +58,8 @@ namespace TAO
   class TAO_PortableServer_Export SArg_Traits<ACE_InputCDR::to_octet>
     : public Special_Basic_SArg_Traits_T<CORBA::Octet,
                                          ACE_InputCDR::to_octet,
-                                         ACE_OutputCDR::from_octet>
+                                         ACE_OutputCDR::from_octet,
+                                         TAO::Any_Insert_Policy_Stream <ACE_OutputCDR::from_octet> >
   {
   };
 
@@ -64,7 +67,9 @@ namespace TAO
   class TAO_PortableServer_Export SArg_Traits<ACE_InputCDR::to_boolean>
     : public Special_Basic_SArg_Traits_T<CORBA::Boolean,
                                          ACE_InputCDR::to_boolean,
-                                         ACE_OutputCDR::from_boolean>
+                                         ACE_OutputCDR::from_boolean,
+                                         TAO::Any_Insert_Policy_Stream <ACE_OutputCDR::from_boolean> >
+
   {
   };
 }
diff --git a/TAO/tao/PortableServer/ThreadPolicyA.cpp b/TAO/tao/PortableServer/ThreadPolicyA.cpp
index ddd3f3e7662..aac6c73f79a 100644
--- a/TAO/tao/PortableServer/ThreadPolicyA.cpp
+++ b/TAO/tao/PortableServer/ThreadPolicyA.cpp
@@ -25,16 +25,16 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "ThreadPolicyC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Enum_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
+#include "ThreadPolicyA.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Enum_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Basic_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Basic_Impl_T.h"
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
@@ -111,79 +111,4 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ThreadPolicy>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ThreadPolicy>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ThreadPolicy>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// 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
-    );
-}
-
-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
-      );
-}
-
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/PortableServer/ThreadPolicyA.h b/TAO/tao/PortableServer/ThreadPolicyA.h
new file mode 100644
index 00000000000..0f5c471402b
--- /dev/null
+++ b/TAO/tao/PortableServer/ThreadPolicyA.h
@@ -0,0 +1,70 @@
+// -*- 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/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:754
+
+#ifndef _TAO_IDL_THREADPOLICYA_H_
+#define _TAO_IDL_THREADPOLICYA_H_
+
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+#include "ThreadPolicyC.h"
+#include "tao/AnyTypeCode/PolicyA.h"
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:59
+
+namespace PortableServer
+{
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
+  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ThreadPolicyValue;
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
+  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ThreadPolicy;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:86
+
+} // module PortableServer
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ThreadPolicyValue);
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ThreadPolicyValue &);
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
diff --git a/TAO/tao/PortableServer/ThreadPolicyC.cpp b/TAO/tao/PortableServer/ThreadPolicyC.cpp
index 413cdbcdfcd..ac2f91049f7 100644
--- a/TAO/tao/PortableServer/ThreadPolicyC.cpp
+++ b/TAO/tao/PortableServer/ThreadPolicyC.cpp
@@ -26,17 +26,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
 #include "ThreadPolicyC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
@@ -90,14 +86,6 @@ PortableServer::ThreadPolicy::ThreadPolicy (void)
 PortableServer::ThreadPolicy::~ThreadPolicy (void)
 {}
 
-void 
-PortableServer::ThreadPolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ThreadPolicy *_tao_tmp_pointer =
-    static_cast<ThreadPolicy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
 PortableServer::ThreadPolicy_ptr
 PortableServer::ThreadPolicy::_narrow (
     CORBA::Object_ptr _tao_objref
diff --git a/TAO/tao/PortableServer/ThreadPolicyC.h b/TAO/tao/PortableServer/ThreadPolicyC.h
index 16481e23122..aad589c4fb3 100644
--- a/TAO/tao/PortableServer/ThreadPolicyC.h
+++ b/TAO/tao/PortableServer/ThreadPolicyC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_THREADPOLICYC_H_
-#define _TAO_IDL_ORIG_THREADPOLICYC_H_
+#ifndef _TAO_IDL_THREADPOLICYC_H_
+#define _TAO_IDL_THREADPOLICYC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -54,53 +54,39 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PortableServer_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#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
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace PortableServer
 {
-  
+
   // TAO_IDL - Generated from
   // 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
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ThreadPolicyValue;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_PORTABLESERVER_THREADPOLICY__VAR_OUT_CH_)
 #define _PORTABLESERVER_THREADPOLICY__VAR_OUT_CH_
-  
+
   class ThreadPolicy;
   typedef ThreadPolicy *ThreadPolicy_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ThreadPolicy
       >
     ThreadPolicy_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ThreadPolicy
@@ -108,122 +94,116 @@ namespace PortableServer
     ThreadPolicy_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLESERVER_THREADPOLICY_CH_)
 #define _PORTABLESERVER_THREADPOLICY_CH_
-  
+
   class TAO_PortableServer_Export ThreadPolicy
     : public virtual ::CORBA::Policy
   {
   public:
     typedef ThreadPolicy_ptr _ptr_type;
     typedef ThreadPolicy_var _var_type;
-    
+
     // The static operations.
     static ThreadPolicy_ptr _duplicate (ThreadPolicy_ptr obj);
-    
+
     static void _tao_release (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 static_cast<ThreadPolicy_ptr> (0);
     }
-    
-    static void _tao_any_destructor (void *);
-    
+
+
+
     // TAO_IDL - Generated from
     // 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
     // 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
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // 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
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     ThreadPolicy (void);
-    
+
     virtual ~ThreadPolicy (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     ThreadPolicy (const ThreadPolicy &);
-    
+
     void operator= (const ThreadPolicy &);
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ThreadPolicy;
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module PortableServer
 
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
 // TAO_IDL - Generated from
 // be\be_visitor_traits.cpp:61
 
+#if (TAO_HAS_MINIMUM_POA == 0)
 // Traits specializations.
 namespace TAO
 {
 
-#if (TAO_HAS_MINIMUM_POA == 0)
+#if !defined (_PORTABLESERVER_THREADPOLICY__TRAITS_)
+#define _PORTABLESERVER_THREADPOLICY__TRAITS_
 
-#if !defined (_PORTABLESERVER_THREADPOLICY__TRAITS_CH_)
-#define _PORTABLESERVER_THREADPOLICY__TRAITS_CH_
-  
   template<>
   struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::ThreadPolicy>
   {
@@ -241,27 +221,9 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_ch.cpp:51
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ThreadPolicyValue);
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ThreadPolicyValue &);
-
-// TAO_IDL - Generated from
-// 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 &);
-
-// TAO_IDL - Generated from
 // be\be_visitor_enum/cdr_op_ch.cpp:50
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, PortableServer::ThreadPolicyValue);
@@ -270,15 +232,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableSer
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+// be\be_codegen.cpp:1028
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PortableServer/TypeCode_SArg_Traits.h b/TAO/tao/PortableServer/TypeCode_SArg_Traits.h
index 1960033a44a..0314b900e76 100644
--- a/TAO/tao/PortableServer/TypeCode_SArg_Traits.h
+++ b/TAO/tao/PortableServer/TypeCode_SArg_Traits.h
@@ -46,7 +46,11 @@ namespace TAO
   class TAO_PortableServer_Export SArg_Traits<CORBA::TypeCode>
     : public Object_SArg_Traits_T<CORBA::TypeCode_ptr,
                                   CORBA::TypeCode_var,
-                                  CORBA::TypeCode_out>
+                                  CORBA::TypeCode_out,
+                                  TAO::Any_Insert_Policy_Stream <
+                                    CORBA::TypeCode_ptr
+                                  >
+                                 >
   {
   };
 }
diff --git a/TAO/tao/PortableServer/UB_String_SArgument_T.cpp b/TAO/tao/PortableServer/UB_String_SArgument_T.cpp
index d73fa550b34..c5d7730469f 100644
--- a/TAO/tao/PortableServer/UB_String_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/UB_String_SArgument_T.cpp
@@ -4,7 +4,6 @@
 #define TAO_UB_STRING_SARGUMENT_T_CPP
 
 #include "tao/PortableServer/UB_String_SArgument_T.h"
-#include "tao/Dynamic_ParameterC.h"
 
 #if !defined (__ACE_INLINE__)
 #include "tao/PortableServer/UB_String_SArgument_T.inl"
@@ -22,12 +21,10 @@ TAO::In_UB_String_SArgument_T<S,S_var>::demarshal (TAO_InputCDR &cdr)
 
 template<typename S, typename S_var>
 void
-TAO::In_UB_String_SArgument_T<S,S_var>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::In_UB_String_SArgument_T<S,S_var>::interceptor_value (
+  CORBA::Any *any) const
 {
-  p.argument <<= this->x_.in ();
-  p.mode = CORBA::PARAM_IN;
+  (*any) <<= this->x_.in ();
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -36,7 +33,7 @@ TAO::In_UB_String_SArgument_T<S,S_var>::interceptor_param (
 
 template<typename S, typename S_var>
 CORBA::Boolean
-TAO::Inout_UB_String_SArgument_T<S,S_var>::marshal (TAO_OutputCDR & cdr)
+TAO::Inout_UB_String_SArgument_T<S,S_var>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << this->x_.in ();
 }
@@ -52,12 +49,10 @@ TAO::Inout_UB_String_SArgument_T<S,S_var>::demarshal (TAO_InputCDR & cdr)
 
 template<typename S, typename S_var>
 void
-TAO::Inout_UB_String_SArgument_T<S,S_var>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::Inout_UB_String_SArgument_T<S,S_var>::interceptor_value (
+  CORBA::Any *any) const
 {
-  p.argument <<= this->x_.in ();
-  p.mode = CORBA::PARAM_INOUT;
+  (*any) <<= this->x_.in ();
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -75,12 +70,10 @@ TAO::Out_UB_String_SArgument_T<S,S_var>::marshal (TAO_OutputCDR &cdr)
 
 template<typename S, typename S_var>
 void
-TAO::Out_UB_String_SArgument_T<S,S_var>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::Out_UB_String_SArgument_T<S,S_var>::interceptor_value (
+  CORBA::Any *any) const
 {
-  p.argument <<= this->x_.in ();
-  p.mode = CORBA::PARAM_OUT;
+  (*any) <<= this->x_.in ();
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -89,7 +82,7 @@ TAO::Out_UB_String_SArgument_T<S,S_var>::interceptor_param (
 
 template<typename S, typename S_var>
 CORBA::Boolean
-TAO::Ret_UB_String_SArgument_T<S,S_var>::marshal (TAO_OutputCDR & cdr)
+TAO::Ret_UB_String_SArgument_T<S,S_var>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << this->x_.in ();
 }
@@ -98,7 +91,8 @@ TAO::Ret_UB_String_SArgument_T<S,S_var>::marshal (TAO_OutputCDR & cdr)
 
 template<typename S, typename S_var>
 void
-TAO::Ret_UB_String_SArgument_T<S,S_var>::interceptor_result (CORBA::Any * any)
+TAO::Ret_UB_String_SArgument_T<S,S_var>::interceptor_value (
+  CORBA::Any *any) const
 {
   (*any) <<= this->x_.in ();
 }
diff --git a/TAO/tao/PortableServer/UB_String_SArgument_T.h b/TAO/tao/PortableServer/UB_String_SArgument_T.h
index d79a4728266..3d681d3e0d9 100644
--- a/TAO/tao/PortableServer/UB_String_SArgument_T.h
+++ b/TAO/tao/PortableServer/UB_String_SArgument_T.h
@@ -30,14 +30,14 @@ namespace TAO
    *
    */
   template<typename S, typename S_var>
-  class In_UB_String_SArgument_T : public Argument
+  class In_UB_String_SArgument_T : public InArgument
   {
   public:
     In_UB_String_SArgument_T (void);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S const * arg (void) const;
 
@@ -52,15 +52,15 @@ namespace TAO
    *
    */
   template<typename S, typename S_var>
-  class Inout_UB_String_SArgument_T : public Argument
+  class Inout_UB_String_SArgument_T : public InoutArgument
   {
   public:
     Inout_UB_String_SArgument_T (void);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S *& arg (void);
 
@@ -75,14 +75,14 @@ namespace TAO
    *
    */
   template<typename S, typename S_var>
-  class Out_UB_String_SArgument_T : public Argument
+  class Out_UB_String_SArgument_T : public OutArgument
   {
   public:
     Out_UB_String_SArgument_T (void);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S *& arg (void);
 
@@ -97,14 +97,14 @@ namespace TAO
    *
    */
   template<typename S, typename S_var>
-  class Ret_UB_String_SArgument_T : public Argument
+  class Ret_UB_String_SArgument_T : public RetArgument
   {
   public:
     Ret_UB_String_SArgument_T (void);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_result (CORBA::Any *);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S *& arg (void);
 
diff --git a/TAO/tao/PortableServer/UB_String_SArguments.h b/TAO/tao/PortableServer/UB_String_SArguments.h
index 4f4194fe8cf..fd3440e5804 100644
--- a/TAO/tao/PortableServer/UB_String_SArguments.h
+++ b/TAO/tao/PortableServer/UB_String_SArguments.h
@@ -22,7 +22,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/PortableServer/UB_String_SArgument_T.h"
-#include "tao/Arg_Traits_T.h"
+#include "tao/PortableServer/SArg_Traits_T.h"
 
 namespace TAO
 {
diff --git a/TAO/tao/PortableServer/Upcall_Wrapper.cpp b/TAO/tao/PortableServer/Upcall_Wrapper.cpp
index 82d0931b8a7..8443f73dd0e 100644
--- a/TAO/tao/PortableServer/Upcall_Wrapper.cpp
+++ b/TAO/tao/PortableServer/Upcall_Wrapper.cpp
@@ -4,7 +4,6 @@
 #include "Upcall_Command.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
-# include "PICurrent_Guard.h"
 # include "tao/ServerRequestInterceptor_Adapter.h"
 # include "tao/PortableInterceptorC.h"
 # include "tao/ORB_Core.h"
@@ -54,9 +53,6 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request,
   ACE_TRY
     {
       {
-        TAO::PICurrent_Guard pi_guard (server_request,
-                                       true  /* Copy TSC to RSC */);
-
         if (interceptor_adapter != 0)
           {
             // Invoke intermediate server side interception points.
@@ -75,11 +71,20 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request,
         CORBA::Object_var forward_to = server_request.forward_location ();
         if (CORBA::is_nil (forward_to.in ()))
           {
+            if (interceptor_adapter != 0)
+              {
+                interceptor_adapter->execute_command (server_request,
+                                                      command
+                                                      ACE_ENV_ARG_PARAMETER);
+                ACE_TRY_CHECK;
+              }
+            else
 #endif /* TAO_HAS_INTERCEPTORS */
-
-            // The actual upcall.
-            command.execute (ACE_ENV_SINGLE_ARG_PARAMETER);
-            TAO_INTERCEPTOR_CHECK;
+              {
+                // The actual upcall.
+                command.execute (ACE_ENV_SINGLE_ARG_PARAMETER);
+                TAO_INTERCEPTOR_CHECK;
+              }
 
 #if TAO_HAS_INTERCEPTORS == 1
           }
diff --git a/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp b/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp
index 8197c3fb819..60218a2d35c 100644
--- a/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp
@@ -4,18 +4,21 @@
 #define TAO_VAR_ARRAY_SARGUMENT_T_CPP
 
 #include "tao/PortableServer/Var_Array_SArgument_T.h"
-#include "tao/Dynamic_ParameterC.h"
 
 #if !defined (__ACE_INLINE__)
 #include "tao/PortableServer/Var_Array_SArgument_T.inl"
 #endif /* __ACE_INLINE__ */
 
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 CORBA::Boolean
 TAO::In_Var_Array_SArgument_T<S,
                               S_slice,
-                              S_forany>::demarshal (TAO_InputCDR & cdr)
+                              S_forany,
+                              Insert_Policy>::demarshal (TAO_InputCDR & cdr)
 {
   S_forany tmp (this->x_);
   return cdr >> tmp;
@@ -23,36 +26,46 @@ TAO::In_Var_Array_SArgument_T<S,
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 void
 TAO::In_Var_Array_SArgument_T<S,
                               S_slice,
-                              S_forany>::interceptor_param (
-    Dynamic::Parameter & p)
+                              S_forany,
+                              Insert_Policy>::interceptor_value (
+    CORBA::Any *any) const
 {
-
-  p.argument <<= S_forany (this->x_);
-  p.mode = CORBA::PARAM_IN;
+  this->Insert_Policy::any_insert (any, S_forany (this->x_));
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ===========================================================
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 CORBA::Boolean
 TAO::Inout_Var_Array_SArgument_T<S,
                                  S_slice,
-                                 S_forany>::marshal (TAO_OutputCDR & cdr)
+                                 S_forany,
+                                 Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << this->x_;
 }
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 CORBA::Boolean
 TAO::Inout_Var_Array_SArgument_T<S,
                                  S_slice,
-                                 S_forany>::demarshal (TAO_InputCDR & cdr)
+                                 S_forany,
+                                 Insert_Policy>::demarshal (TAO_InputCDR & cdr)
 {
   S_forany tmp (this->x_);
   return cdr >> tmp;
@@ -60,22 +73,33 @@ TAO::Inout_Var_Array_SArgument_T<S,
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 void
-TAO::Inout_Var_Array_SArgument_T<S, S_slice, S_forany>::interceptor_param (
-  Dynamic::Parameter & p)
+TAO::Inout_Var_Array_SArgument_T<S,
+                                 S_slice,
+                                 S_forany,
+                                 Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  p.argument <<= S_forany (this->x_);
-  p.mode = CORBA::PARAM_INOUT;
+  this->Insert_Policy::any_insert (any, S_forany (this->x_));
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ==============================================================
 
-template<typename S_slice, typename S_var, typename S_forany>
+template<typename S_slice,
+         typename S_var,
+         typename S_forany,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Out_Var_Array_SArgument_T<S_slice,S_var,S_forany>::marshal (
+TAO::Out_Var_Array_SArgument_T<S_slice,
+                               S_var,
+                               S_forany,
+                               Insert_Policy>::marshal (
     TAO_OutputCDR & cdr
   )
 {
@@ -85,23 +109,33 @@ TAO::Out_Var_Array_SArgument_T<S_slice,S_var,S_forany>::marshal (
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S_slice, typename S_var, typename S_forany>
+template<typename S_slice,
+         typename S_var,
+         typename S_forany,
+         typename Insert_Policy>
 void
-TAO::Out_Var_Array_SArgument_T<S_slice,S_var,S_forany>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::Out_Var_Array_SArgument_T<S_slice,
+                               S_var,
+                               S_forany,
+                               Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  p.argument <<= S_forany (this->x_.ptr ());
-  p.mode = CORBA::PARAM_OUT;
+  this->Insert_Policy::any_insert (any, S_forany (this->x_.ptr ()));
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ============================================================
 
-template<typename S_slice, typename S_var, typename S_forany>
+template<typename S_slice,
+         typename S_var,
+         typename S_forany,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Ret_Var_Array_SArgument_T<S_slice,S_var,S_forany>::marshal (
+TAO::Ret_Var_Array_SArgument_T<S_slice,
+                               S_var,
+                               S_forany,
+                               Insert_Policy>::marshal (
     TAO_OutputCDR & cdr
   )
 {
@@ -110,13 +144,18 @@ TAO::Ret_Var_Array_SArgument_T<S_slice,S_var,S_forany>::marshal (
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S_slice, typename S_var, typename S_forany>
+template<typename S_slice,
+         typename S_var,
+         typename S_forany,
+         typename Insert_Policy>
 void
-TAO::Ret_Var_Array_SArgument_T<S_slice,S_var,S_forany>::interceptor_result (
-    CORBA::Any * any
-  )
+TAO::Ret_Var_Array_SArgument_T<S_slice,
+                               S_var,
+                               S_forany,
+                               Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  (*any) <<= S_forany (this->x_.ptr ());
+  this->Insert_Policy::any_insert (any, S_forany (this->x_.ptr ()));
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
diff --git a/TAO/tao/PortableServer/Var_Array_SArgument_T.h b/TAO/tao/PortableServer/Var_Array_SArgument_T.h
index a3eb5572772..d5f607cba2f 100644
--- a/TAO/tao/PortableServer/Var_Array_SArgument_T.h
+++ b/TAO/tao/PortableServer/Var_Array_SArgument_T.h
@@ -29,8 +29,11 @@ namespace TAO
    * @brief IN skeleton argument of variable size element array.
    *
    */
-  template<typename S, typename S_slice, typename S_forany>
-  class In_Var_Array_SArgument_T : public Argument
+  template<typename S,
+           typename S_slice,
+           typename S_forany,
+           typename Insert_Policy>
+  class In_Var_Array_SArgument_T : public InArgument, private Insert_Policy
   {
   public:
 
@@ -38,7 +41,7 @@ namespace TAO
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S_slice const * arg (void) const;
 
@@ -52,21 +55,24 @@ namespace TAO
    * @brief INOUT skeleton argument of variable size element array.
    *
    */
-  template<typename S, typename S_slice, typename S_forany>
-  class Inout_Var_Array_SArgument_T : public Argument
+  template<typename S,
+           typename S_slice,
+           typename S_forany,
+           typename Insert_Policy>
+  class Inout_Var_Array_SArgument_T : public InoutArgument, private Insert_Policy
   {
   public:
     Inout_Var_Array_SArgument_T (void);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S_slice * arg (void);
 
   private:
-    S x_;
+    mutable S x_;
   };
 
   /**
@@ -75,15 +81,18 @@ namespace TAO
    * @brief OUT skeleton argument of variable size element array.
    *
    */
-  template<typename S_slice, typename S_var, typename S_forany>
-  class Out_Var_Array_SArgument_T : public Argument
+  template<typename S_slice,
+           typename S_var,
+           typename S_forany,
+           typename Insert_Policy>
+  class Out_Var_Array_SArgument_T : public OutArgument, private Insert_Policy
   {
   public:
     Out_Var_Array_SArgument_T (void);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S_slice *& arg (void);
 
@@ -97,15 +106,18 @@ namespace TAO
    * @brief Skeleton value of variable size element array.
    *
    */
-  template<typename S_slice, typename S_var, typename S_forany>
-  class Ret_Var_Array_SArgument_T : public Argument
+  template<typename S_slice,
+           typename S_var,
+           typename S_forany,
+           typename Insert_Policy>
+  class Ret_Var_Array_SArgument_T : public RetArgument, private Insert_Policy
   {
   public:
     Ret_Var_Array_SArgument_T (void);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_result (CORBA::Any *);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S_slice *& arg (void);
 
@@ -123,7 +135,8 @@ namespace TAO
            typename T_slice,
            typename T_var,
            typename T_out,
-           typename T_forany>
+           typename T_forany,
+           typename Insert_Policy>
   struct Var_Array_SArg_Traits_T
   {
     typedef T_slice *                                   ret_type;
@@ -133,16 +146,20 @@ namespace TAO
 
     typedef In_Var_Array_SArgument_T<T,
                                      T_slice,
-                                     T_forany>          in_arg_val;
+                                     T_forany,
+                                     Insert_Policy>          in_arg_val;
     typedef Inout_Var_Array_SArgument_T<T,
                                         T_slice,
-                                        T_forany>       inout_arg_val;
+                                        T_forany,
+                                        Insert_Policy>       inout_arg_val;
     typedef Out_Var_Array_SArgument_T<T_slice,
                                       T_var,
-                                      T_forany>         out_arg_val;
+                                      T_forany,
+                                      Insert_Policy>         out_arg_val;
     typedef Ret_Var_Array_SArgument_T<T_slice,
                                       T_var,
-                                      T_forany>         ret_val;
+                                      T_forany,
+                                      Insert_Policy>         ret_val;
 
     // Typedefs corresponding to return value of arg() method in both
     // the client and server side argument class templates.
diff --git a/TAO/tao/PortableServer/Var_Array_SArgument_T.inl b/TAO/tao/PortableServer/Var_Array_SArgument_T.inl
index fe3a700ffa5..30674cca189 100644
--- a/TAO/tao/PortableServer/Var_Array_SArgument_T.inl
+++ b/TAO/tao/PortableServer/Var_Array_SArgument_T.inl
@@ -3,19 +3,27 @@
 // $Id$
 
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 ACE_INLINE
 TAO::In_Var_Array_SArgument_T<S,
                               S_slice,
-                              S_forany>::In_Var_Array_SArgument_T (void)
+                              S_forany,
+                              Insert_Policy>::In_Var_Array_SArgument_T (void)
 {}
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 ACE_INLINE
 S_slice const *
 TAO::In_Var_Array_SArgument_T<S,
                               S_slice,
-                              S_forany>::arg (void) const
+                              S_forany,
+                              Insert_Policy>::arg (void) const
 {
   S_forany tmp (this->x_);
   return tmp.in ();
@@ -23,18 +31,28 @@ TAO::In_Var_Array_SArgument_T<S,
 
 // ==========================================================================
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 ACE_INLINE
 TAO::Inout_Var_Array_SArgument_T<S,
                                  S_slice,
-                                 S_forany>::Inout_Var_Array_SArgument_T (void)
-{}
+                                 S_forany,
+                                 Insert_Policy>::
+Inout_Var_Array_SArgument_T (void)
+{
+}
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 S_slice *
 TAO::Inout_Var_Array_SArgument_T<S,
                                  S_slice,
-                                 S_forany>::arg (void)
+                                 S_forany,
+                                 Insert_Policy>::arg (void)
 {
   S_forany tmp (this->x_);
   return tmp.inout ();
@@ -42,31 +60,57 @@ TAO::Inout_Var_Array_SArgument_T<S,
 
 // ==========================================================================
 
-template<typename S_slice, typename S_var, typename S_forany>
+template<typename S_slice,
+         typename S_var,
+         typename S_forany,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Out_Var_Array_SArgument_T<S_slice,S_var,S_forany>::
+TAO::Out_Var_Array_SArgument_T<S_slice,
+                               S_var,
+                               S_forany,
+                               Insert_Policy>::
 Out_Var_Array_SArgument_T (void)
-{}
+{
+}
 
-template<typename S_slice, typename S_var, typename S_forany>
+template<typename S_slice,
+         typename S_var,
+         typename S_forany,
+         typename Insert_Policy>
 S_slice *&
-TAO::Out_Var_Array_SArgument_T<S_slice,S_var,S_forany>::arg (void)
+TAO::Out_Var_Array_SArgument_T<S_slice,
+                               S_var,
+                               S_forany,
+                               Insert_Policy>::arg (void)
 {
   return this->x_.out ();
 }
 
 // ==========================================================================
 
-template<typename S_slice, typename S_var, typename S_forany>
+template<typename S_slice,
+         typename S_var,
+         typename S_forany,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Ret_Var_Array_SArgument_T<S_slice,S_var,S_forany>::
+TAO::Ret_Var_Array_SArgument_T<S_slice,
+                               S_var,
+                               S_forany,
+                               Insert_Policy>::
 Ret_Var_Array_SArgument_T (void)
-{}
+{
+}
 
-template<typename S_slice, typename S_var, typename S_forany>
+template<typename S_slice,
+         typename S_var,
+         typename S_forany,
+         typename Insert_Policy>
 ACE_INLINE
 S_slice *&
-TAO::Ret_Var_Array_SArgument_T<S_slice,S_var,S_forany>::arg (void)
+TAO::Ret_Var_Array_SArgument_T<S_slice,
+                               S_var,
+                               S_forany,
+                               Insert_Policy>::arg (void)
 {
   return this->x_.out ();
 }
diff --git a/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp b/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp
index 43209797b21..64b6229bd10 100644
--- a/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp
@@ -4,99 +4,108 @@
 #define TAO_VAR_SIZE_SARGUMENT_T_CPP
 
 #include "tao/PortableServer/Var_Size_SArgument_T.h"
-#include "tao/Dynamic_ParameterC.h"
 
 #if !defined (__ACE_INLINE__)
 #include "tao/PortableServer/Var_Size_SArgument_T.inl"
 #endif /* __ACE_INLINE__ */
 
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::In_Var_Size_SArgument_T<S>::demarshal (TAO_InputCDR &cdr)
+TAO::In_Var_Size_SArgument_T<S,Insert_Policy>::demarshal (TAO_InputCDR &cdr)
 {
   return cdr >> this->x_;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 void
-TAO::In_Var_Size_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p)
+TAO::In_Var_Size_SArgument_T<S,Insert_Policy>::interceptor_value (CORBA::Any *any) const
 {
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_IN;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ===========================================================
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_Var_Size_SArgument_T<S>::marshal (TAO_OutputCDR & cdr)
+TAO::Inout_Var_Size_SArgument_T<S,Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << this->x_;
 }
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_Var_Size_SArgument_T<S>::demarshal (TAO_InputCDR & cdr)
+TAO::Inout_Var_Size_SArgument_T<S,Insert_Policy>::demarshal (TAO_InputCDR & cdr)
 {
   return cdr >> this->x_;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 void
-TAO::Inout_Var_Size_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p)
+TAO::Inout_Var_Size_SArgument_T<S,Insert_Policy>::interceptor_value (CORBA::Any *any) const
 {
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_INOUT;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ==============================================================
 
-template<typename S, typename S_var>
+template<typename S,
+         typename S_var,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Out_Var_Size_SArgument_T<S,S_var>::marshal (TAO_OutputCDR &cdr)
+TAO::Out_Var_Size_SArgument_T<S,S_var,Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << this->x_.in ();
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, typename S_var>
+template<typename S,
+         typename S_var,
+         typename Insert_Policy>
 void
-TAO::Out_Var_Size_SArgument_T<S,S_var>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::Out_Var_Size_SArgument_T<S,S_var,Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  p.argument <<= this->x_.in ();
-  p.mode = CORBA::PARAM_OUT;
+  this->Insert_Policy::any_insert (any, this->x_.in ());
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ============================================================
 
-template<typename S, typename S_var>
+template<typename S,
+         typename S_var,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Ret_Var_Size_SArgument_T<S,S_var>::marshal (TAO_OutputCDR & cdr)
+TAO::Ret_Var_Size_SArgument_T<S,S_var,Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << this->x_.in ();
 }
-#if TAO_HAS_INTERCEPTORS == 1
 
+#if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, typename S_var>
+template<typename S,
+         typename S_var,
+         typename Insert_Policy>
 void
-TAO::Ret_Var_Size_SArgument_T<S,S_var>::interceptor_result (CORBA::Any * any)
+TAO::Ret_Var_Size_SArgument_T<S,S_var,Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  (*any) <<= this->x_.in ();
+  this->Insert_Policy::any_insert (any, this->x_.in ());
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
diff --git a/TAO/tao/PortableServer/Var_Size_SArgument_T.h b/TAO/tao/PortableServer/Var_Size_SArgument_T.h
index 29c5ef58dd5..14585cc096a 100644
--- a/TAO/tao/PortableServer/Var_Size_SArgument_T.h
+++ b/TAO/tao/PortableServer/Var_Size_SArgument_T.h
@@ -28,14 +28,15 @@ namespace TAO
    * @brief Template class for IN skeleton argument of fixed size IDL types.
    *
    */
-  template<typename S>
-  class In_Var_Size_SArgument_T : public Argument
+  template<typename S,
+           typename Insert_Policy>
+  class In_Var_Size_SArgument_T : public InArgument, private Insert_Policy
   {
   public:
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S const & arg (void) const;
 
@@ -49,16 +50,17 @@ namespace TAO
    * @brief Template class for INOUT skeleton arg of fixed size IDL types.
    *
    */
-  template<typename S>
-  class Inout_Var_Size_SArgument_T : public Argument
+  template<typename S,
+           typename Insert_Policy>
+  class Inout_Var_Size_SArgument_T : public InoutArgument, private Insert_Policy
   {
   public:
     Inout_Var_Size_SArgument_T (void);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S & arg (void);
 
@@ -72,15 +74,17 @@ namespace TAO
    * @brief Template class for OUT skeleton argument of fixed size IDL types.
    *
    */
-  template<typename S, typename S_var>
-  class Out_Var_Size_SArgument_T : public Argument
+  template<typename S,
+           typename S_var,
+           typename Insert_Policy>
+  class Out_Var_Size_SArgument_T : public OutArgument, private Insert_Policy
   {
   public:
     Out_Var_Size_SArgument_T (void);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S *& arg (void);
 
@@ -94,15 +98,17 @@ namespace TAO
    * @brief Template class for return skeleton value of fixed size IDL types.
    *
    */
-  template<typename S, typename S_var>
-  class Ret_Var_Size_SArgument_T : public Argument
+  template<typename S,
+           typename S_var,
+           typename Insert_Policy>
+  class Ret_Var_Size_SArgument_T : public RetArgument, private Insert_Policy
   {
   public:
     Ret_Var_Size_SArgument_T (void);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_result (CORBA::Any *);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S *& arg (void);
 
@@ -111,31 +117,34 @@ namespace TAO
   };
 
   /**
-   * @struct Basic_SArg_Traits_T
+   * @struct Var_Size_SArg_Traits_T
    *
    * @brief Template class for skeleton argument traits of
    *  variable size IDL types.
    *
    */
-  template<typename T, typename T_var, typename T_out>
+  template<typename T,
+           typename T_var,
+           typename T_out,
+           typename Insert_Policy>
   struct Var_Size_SArg_Traits_T
   {
-    typedef T *                                         ret_type;
-    typedef const T &                                   in_type;
-    typedef T &                                         inout_type;
-    typedef T_out                                       out_type;
+    typedef T *                                             ret_type;
+    typedef const T &                                       in_type;
+    typedef T &                                             inout_type;
+    typedef T_out                                           out_type;
 
-    typedef In_Var_Size_SArgument_T<T>                  in_arg_val;
-    typedef Inout_Var_Size_SArgument_T<T>               inout_arg_val;
-    typedef Out_Var_Size_SArgument_T<T,T_var>           out_arg_val;
-    typedef Ret_Var_Size_SArgument_T<T,T_var>           ret_val;
+    typedef In_Var_Size_SArgument_T<T,Insert_Policy>        in_arg_val;
+    typedef Inout_Var_Size_SArgument_T<T,Insert_Policy>     inout_arg_val;
+    typedef Out_Var_Size_SArgument_T<T,T_var,Insert_Policy> out_arg_val;
+    typedef Ret_Var_Size_SArgument_T<T,T_var,Insert_Policy> ret_val;
 
     // Typedefs corresponding to return value of arg() method in both
     // the client and server side argument class templates.
-    typedef in_type                                     in_arg_type;
-    typedef inout_type                                  inout_arg_type;
-    typedef ret_type &                                  out_arg_type;
-    typedef ret_type &                                  ret_arg_type;
+    typedef in_type                                         in_arg_type;
+    typedef inout_type                                      inout_arg_type;
+    typedef ret_type &                                      out_arg_type;
+    typedef ret_type &                                      ret_arg_type;
 
   };
 }
diff --git a/TAO/tao/PortableServer/Var_Size_SArgument_T.inl b/TAO/tao/PortableServer/Var_Size_SArgument_T.inl
index ba15bec73ac..7c516b117ec 100644
--- a/TAO/tao/PortableServer/Var_Size_SArgument_T.inl
+++ b/TAO/tao/PortableServer/Var_Size_SArgument_T.inl
@@ -2,53 +2,66 @@
 //
 // $Id$
 
-
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 S const &
-TAO::In_Var_Size_SArgument_T<S>::arg (void) const
+TAO::In_Var_Size_SArgument_T<S,Insert_Policy>::arg (void) const
 {
   return this->x_;
 }
 
 // ==========================================================================
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Inout_Var_Size_SArgument_T<S>::Inout_Var_Size_SArgument_T (void)
-{}
+TAO::Inout_Var_Size_SArgument_T<S,Insert_Policy>::Inout_Var_Size_SArgument_T (void)
+{
+}
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 S &
-TAO::Inout_Var_Size_SArgument_T<S>::arg (void)
+TAO::Inout_Var_Size_SArgument_T<S,Insert_Policy>::arg (void)
 {
   return this->x_;
 }
 
 // ==========================================================================
 
-template<typename S, typename S_var>
+template<typename S,
+         typename S_var,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Out_Var_Size_SArgument_T<S,S_var>::Out_Var_Size_SArgument_T (void)
-{}
+TAO::Out_Var_Size_SArgument_T<S,S_var,Insert_Policy>::Out_Var_Size_SArgument_T (void)
+{
+}
 
-template<typename S, typename S_var>
+template<typename S,
+         typename S_var,
+         typename Insert_Policy>
 S *&
-TAO::Out_Var_Size_SArgument_T<S,S_var>::arg (void)
+TAO::Out_Var_Size_SArgument_T<S,S_var,Insert_Policy>::arg (void)
 {
   return this->x_.out ();
 }
 
 // ==========================================================================
 
-template<typename S, typename S_var>
+template<typename S,
+         typename S_var,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Ret_Var_Size_SArgument_T<S,S_var>::Ret_Var_Size_SArgument_T (void)
-{}
+TAO::Ret_Var_Size_SArgument_T<S,S_var,Insert_Policy>::Ret_Var_Size_SArgument_T (void)
+{
+}
 
-template<typename S, typename S_var>
+template<typename S,
+         typename S_var,
+         typename Insert_Policy>
 ACE_INLINE
 S *&
-TAO::Ret_Var_Size_SArgument_T<S,S_var>::arg (void)
+TAO::Ret_Var_Size_SArgument_T<S,S_var,Insert_Policy>::arg (void)
 {
   return this->x_.out ();
 }
diff --git a/TAO/tao/Profile.h b/TAO/tao/Profile.h
index 6821ee1a5f6..016d17ce1d7 100644
--- a/TAO/tao/Profile.h
+++ b/TAO/tao/Profile.h
@@ -60,7 +60,6 @@ public:
   /**
    * @name Non virtual methods for the profile classes.
   */
-
   //@{
   /// The tag, each concrete class will have a specific tag value.
   CORBA::ULong tag (void) const;
diff --git a/TAO/tao/Profile_Transport_Resolver.h b/TAO/tao/Profile_Transport_Resolver.h
index 4c09b20d327..0dd849a04a5 100644
--- a/TAO/tao/Profile_Transport_Resolver.h
+++ b/TAO/tao/Profile_Transport_Resolver.h
@@ -89,7 +89,7 @@ namespace TAO
 
     //@{
     /**
-     * Accessors and mutators for this class. The following methods
+     * @name Accessors and mutators for this class. The following methods
      * are used by the clients of this class to access strategies and
      * other internal workings.
      */
diff --git a/TAO/tao/Protocols_Hooks.h b/TAO/tao/Protocols_Hooks.h
index ba64e7a1c42..c176aa2bc44 100644
--- a/TAO/tao/Protocols_Hooks.h
+++ b/TAO/tao/Protocols_Hooks.h
@@ -174,7 +174,7 @@ public:
                                                int &in_range) = 0;
 
   /**
-   * Accessor and modifier to the current thread priority, used to
+   * @name Accessor and modifier to the current thread priority, used to
    * implement the RTCORBA::Current interface, but it is faster for
    * some critical components.  If the RTCORBA library isn't used,
    * these operations are no-ops.
diff --git a/TAO/tao/RTCORBA.mpc b/TAO/tao/RTCORBA.mpc
index b2f52e02b67..b409840f159 100644
--- a/TAO/tao/RTCORBA.mpc
+++ b/TAO/tao/RTCORBA.mpc
@@ -28,6 +28,9 @@ project : taolib, core, pi {
     RTCORBA
   }
 
+  IDL_Files {
+  }
+
   Pkgconfig_Files {
     RTCORBA/TAO_RTCORBA.pc.in
   }
diff --git a/TAO/tao/RTCORBA/RTCORBAA.cpp b/TAO/tao/RTCORBA/RTCORBAA.cpp
index 8611ac7c104..024e8b87aac 100644
--- a/TAO/tao/RTCORBA/RTCORBAA.cpp
+++ b/TAO/tao/RTCORBA/RTCORBAA.cpp
@@ -26,21 +26,22 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "RTCORBA.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Enum_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/Recursive_Type_TypeCode.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Enum_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Sequence_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
+#include "tao/AnyTypeCode/Recursive_Type_TypeCode.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
-#include "tao/Any_Basic_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Basic_Impl_T.h"
+#include "tao/AnyTypeCode/IOP_IORA.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/alias_typecode.cpp:50
@@ -53,7 +54,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/RTCORBA/NativePriority:1.0",
     "NativePriority",
     &CORBA::_tc_short);
-  
+
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_NativePriority =
@@ -73,7 +74,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/RTCORBA/Priority:1.0",
     "Priority",
     &CORBA::_tc_short);
-  
+
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_Priority =
@@ -93,7 +94,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/RTCORBA/NetworkPriority:1.0",
     "NetworkPriority",
     &CORBA::_tc_long);
-  
+
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_NetworkPriority =
@@ -113,7 +114,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/RTCORBA/ThreadpoolId:1.0",
     "ThreadpoolId",
     &CORBA::_tc_ulong);
-  
+
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ThreadpoolId =
@@ -130,7 +131,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
     { "lane_priority", &RTCORBA::_tc_Priority },
     { "static_threads", &CORBA::_tc_ulong },
     { "dynamic_threads", &CORBA::_tc_ulong }
-    
+
   };
 static TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
@@ -142,7 +143,7 @@ static TAO::TypeCode::Struct<char const *,
     "ThreadpoolLane",
     _tao_fields_RTCORBA_ThreadpoolLane,
     3);
-  
+
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ThreadpoolLane =
@@ -172,10 +173,10 @@ namespace TAO
         CORBA::tk_sequence,
         &RTCORBA::_tc_ThreadpoolLane,
         0U);
-      
+
     ::CORBA::TypeCode_ptr const tc_RTCORBA_ThreadpoolLanes_0 =
       &RTCORBA_ThreadpoolLanes_0;
-    
+
   }
 }
 
@@ -190,7 +191,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/RTCORBA/ThreadpoolLanes:1.0",
     "ThreadpoolLanes",
     &TAO::TypeCode::tc_RTCORBA_ThreadpoolLanes_0);
-  
+
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ThreadpoolLanes =
@@ -206,7 +207,7 @@ static char const * const _tao_enumerators_RTCORBA_PriorityModel[] =
   {
     "CLIENT_PROPAGATED",
     "SERVER_DECLARED"
-    
+
   };
 
 static TAO::TypeCode::Enum<char const *,
@@ -217,7 +218,7 @@ static TAO::TypeCode::Enum<char const *,
     "PriorityModel",
     _tao_enumerators_RTCORBA_PriorityModel,
     2);
-  
+
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_PriorityModel =
@@ -235,7 +236,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/RTCORBA/PriorityModelPolicy:1.0",
     "PriorityModelPolicy");
-  
+
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_PriorityModelPolicy =
@@ -253,7 +254,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/RTCORBA/ThreadpoolPolicy:1.0",
     "ThreadpoolPolicy");
-  
+
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ThreadpoolPolicy =
@@ -271,7 +272,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/RTCORBA/ProtocolProperties:1.0",
     "ProtocolProperties");
-  
+
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ProtocolProperties =
@@ -288,7 +289,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
     { "protocol_type", &IOP::_tc_ProfileId },
     { "orb_protocol_properties", &RTCORBA::_tc_ProtocolProperties },
     { "transport_protocol_properties", &RTCORBA::_tc_ProtocolProperties }
-    
+
   };
 static TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
@@ -300,7 +301,7 @@ static TAO::TypeCode::Struct<char const *,
     "Protocol",
     _tao_fields_RTCORBA_Protocol,
     3);
-  
+
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_Protocol =
@@ -330,10 +331,10 @@ namespace TAO
         CORBA::tk_sequence,
         &RTCORBA::_tc_Protocol,
         0U);
-      
+
     ::CORBA::TypeCode_ptr const tc_RTCORBA_ProtocolList_0 =
       &RTCORBA_ProtocolList_0;
-    
+
   }
 }
 
@@ -348,7 +349,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/RTCORBA/ProtocolList:1.0",
     "ProtocolList",
     &TAO::TypeCode::tc_RTCORBA_ProtocolList_0);
-  
+
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ProtocolList =
@@ -366,7 +367,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/RTCORBA/ServerProtocolPolicy:1.0",
     "ServerProtocolPolicy");
-  
+
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ServerProtocolPolicy =
@@ -384,7 +385,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/RTCORBA/ClientProtocolPolicy:1.0",
     "ClientProtocolPolicy");
-  
+
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ClientProtocolPolicy =
@@ -402,7 +403,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/RTCORBA/PrivateConnectionPolicy:1.0",
     "PrivateConnectionPolicy");
-  
+
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_PrivateConnectionPolicy =
@@ -420,7 +421,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/RTCORBA/TCPProtocolProperties:1.0",
     "TCPProtocolProperties");
-  
+
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_TCPProtocolProperties =
@@ -438,7 +439,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/RTCORBA/GIOPProtocolProperties:1.0",
     "GIOPProtocolProperties");
-  
+
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_GIOPProtocolProperties =
@@ -456,7 +457,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/RTCORBA/UnixDomainProtocolProperties:1.0",
     "UnixDomainProtocolProperties");
-  
+
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_UnixDomainProtocolProperties =
@@ -474,7 +475,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/RTCORBA/SharedMemoryProtocolProperties:1.0",
     "SharedMemoryProtocolProperties");
-  
+
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_SharedMemoryProtocolProperties =
@@ -492,7 +493,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/RTCORBA/UserDatagramProtocolProperties:1.0",
     "UserDatagramProtocolProperties");
-  
+
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_UserDatagramProtocolProperties =
@@ -510,7 +511,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/RTCORBA/StreamControlProtocolProperties:1.0",
     "StreamControlProtocolProperties");
-  
+
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_StreamControlProtocolProperties =
@@ -526,7 +527,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
   {
     { "low", &RTCORBA::_tc_Priority },
     { "high", &RTCORBA::_tc_Priority }
-    
+
   };
 static TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
@@ -538,7 +539,7 @@ static TAO::TypeCode::Struct<char const *,
     "PriorityBand",
     _tao_fields_RTCORBA_PriorityBand,
     2);
-  
+
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_PriorityBand =
@@ -568,10 +569,10 @@ namespace TAO
         CORBA::tk_sequence,
         &RTCORBA::_tc_PriorityBand,
         0U);
-      
+
     ::CORBA::TypeCode_ptr const tc_RTCORBA_PriorityBands_0 =
       &RTCORBA_PriorityBands_0;
-    
+
   }
 }
 
@@ -586,7 +587,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/RTCORBA/PriorityBands:1.0",
     "PriorityBands",
     &TAO::TypeCode::tc_RTCORBA_PriorityBands_0);
-  
+
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_PriorityBands =
@@ -604,7 +605,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/RTCORBA/PriorityBandedConnectionPolicy:1.0",
     "PriorityBandedConnectionPolicy");
-  
+
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_PriorityBandedConnectionPolicy =
@@ -622,7 +623,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/RTCORBA/Current:1.0",
     "Current");
-  
+
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_Current =
@@ -640,7 +641,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/RTCORBA/Mutex:1.0",
     "Mutex");
-  
+
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_Mutex =
@@ -663,7 +664,7 @@ static TAO::TypeCode::Struct<char const *,
     "MutexNotFound",
     _tao_fields_RTCORBA_RTORB_MutexNotFound,
     0);
-  
+
 ::CORBA::TypeCode_ptr const RTCORBA::RTORB::_tc_MutexNotFound =
   &_tao_tc_RTCORBA_RTORB_MutexNotFound;
 
@@ -681,7 +682,7 @@ static TAO::TypeCode::Struct<char const *,
     "InvalidThreadpool",
     _tao_fields_RTCORBA_RTORB_InvalidThreadpool,
     0);
-  
+
 ::CORBA::TypeCode_ptr const RTCORBA::RTORB::_tc_InvalidThreadpool =
   &_tao_tc_RTCORBA_RTORB_InvalidThreadpool;
 
@@ -694,7 +695,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/RTCORBA/RTORB:1.0",
     "RTORB");
-  
+
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_RTORB =
@@ -703,7 +704,7 @@ namespace RTCORBA
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -761,7 +762,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 
@@ -844,7 +845,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Basic_Impl_T<RTCORBA::PriorityModel>::extract (
         _tao_any,
         RTCORBA::_tc_PriorityModel,
-        _tao_elem 
+        _tao_elem
       );
 }
 
@@ -872,7 +873,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<RTCORBA::PriorityModelPolicy>::demarshal_value (TAO_InputCDR &)
@@ -947,7 +948,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<RTCORBA::ThreadpoolPolicy>::demarshal_value (TAO_InputCDR &)
@@ -1022,7 +1023,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<RTCORBA::ProtocolProperties>::demarshal_value (TAO_InputCDR &)
@@ -1073,7 +1074,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 
@@ -1086,7 +1087,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Dual_Impl_T<RTCORBA::Protocol>::demarshal_value (TAO_InputCDR &)
@@ -1148,7 +1149,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 namespace TAO
@@ -1159,7 +1160,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Dual_Impl_T<RTCORBA::ProtocolList>::demarshal_value (TAO_InputCDR &)
@@ -1247,7 +1248,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<RTCORBA::ServerProtocolPolicy>::demarshal_value (TAO_InputCDR &)
@@ -1322,7 +1323,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<RTCORBA::ClientProtocolPolicy>::demarshal_value (TAO_InputCDR &)
@@ -1397,7 +1398,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<RTCORBA::PrivateConnectionPolicy>::demarshal_value (TAO_InputCDR &)
@@ -1472,7 +1473,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<RTCORBA::TCPProtocolProperties>::demarshal_value (TAO_InputCDR &)
@@ -1547,7 +1548,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<RTCORBA::GIOPProtocolProperties>::demarshal_value (TAO_InputCDR &)
@@ -1622,7 +1623,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<RTCORBA::UnixDomainProtocolProperties>::demarshal_value (TAO_InputCDR &)
@@ -1697,7 +1698,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<RTCORBA::SharedMemoryProtocolProperties>::demarshal_value (TAO_InputCDR &)
@@ -1772,7 +1773,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<RTCORBA::UserDatagramProtocolProperties>::demarshal_value (TAO_InputCDR &)
@@ -1847,7 +1848,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<RTCORBA::StreamControlProtocolProperties>::demarshal_value (TAO_InputCDR &)
@@ -1898,7 +1899,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -1956,7 +1957,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 
@@ -2039,7 +2040,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<RTCORBA::PriorityBandedConnectionPolicy>::demarshal_value (TAO_InputCDR &)
@@ -2114,7 +2115,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<RTCORBA::Current>::demarshal_value (TAO_InputCDR &)
@@ -2189,7 +2190,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<RTCORBA::Mutex>::demarshal_value (TAO_InputCDR &)
@@ -2264,7 +2265,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<RTCORBA::RTORB>::demarshal_value (TAO_InputCDR &)
@@ -2315,7 +2316,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 namespace TAO
@@ -2326,7 +2327,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Dual_Impl_T<RTCORBA::RTORB::MutexNotFound>::demarshal_value (TAO_InputCDR &)
@@ -2390,7 +2391,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 namespace TAO
@@ -2401,7 +2402,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Dual_Impl_T<RTCORBA::RTORB::InvalidThreadpool>::demarshal_value (TAO_InputCDR &)
diff --git a/TAO/tao/RTCORBA/RTCORBA_includeA.h b/TAO/tao/RTCORBA/RTCORBA_includeA.h
new file mode 100644
index 00000000000..e0779b11bc4
--- /dev/null
+++ b/TAO/tao/RTCORBA/RTCORBA_includeA.h
@@ -0,0 +1,4 @@
+//$Id$
+/**
+* Just a place holder for files that include RTCORBA_include.pidl
+*/
diff --git a/TAO/tao/RTCORBA/RT_Policy_i.cpp b/TAO/tao/RTCORBA/RT_Policy_i.cpp
index abcc9239638..3cd3f89a885 100644
--- a/TAO/tao/RTCORBA/RT_Policy_i.cpp
+++ b/TAO/tao/RTCORBA/RT_Policy_i.cpp
@@ -8,6 +8,7 @@
 #include "tao/Policy_Manager.h"
 #include "tao/debug.h"
 #include "tao/CDR.h"
+#include "tao/AnyTypeCode/Any.h"
 
 #include "ace/OS_NS_string.h"
 
diff --git a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp
index 8b580a178fe..fbde6dd0101 100644
--- a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp
+++ b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp
@@ -110,7 +110,7 @@ TAO_RT_Thread_Lane_Resources_Manager::lane_resources (void)
 
   // Get the lane for this thread.
   TAO_Thread_Lane *lane =
-    (TAO_Thread_Lane *) tss.lane_;
+    static_cast <TAO_Thread_Lane *> (tss.lane_);
 
   // If we have a valid lane, use that lane's resources.
   if (lane)
diff --git a/TAO/tao/RTPortableServer.mpc b/TAO/tao/RTPortableServer.mpc
index db280bc5b09..9f6206d879e 100644
--- a/TAO/tao/RTPortableServer.mpc
+++ b/TAO/tao/RTPortableServer.mpc
@@ -27,6 +27,9 @@ project : taolib, core, rtcorba, portableserver {
     RTPortableServer
   }
 
+  IDL_Files {
+  }
+
   Pkgconfig_Files {
     RTPortableServer/TAO_RTPortableServer.pc.in
   }
diff --git a/TAO/tao/RTPortableServer/RTPortableServerA.cpp b/TAO/tao/RTPortableServer/RTPortableServerA.cpp
index 268d914e6f7..7ebc2fb5586 100644
--- a/TAO/tao/RTPortableServer/RTPortableServerA.cpp
+++ b/TAO/tao/RTPortableServer/RTPortableServerA.cpp
@@ -26,14 +26,14 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "RTPortableServer.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
 
 // TAO_IDL - Generated from
 // be/be_visitor_typecode/objref_typecode.cpp:76
@@ -44,7 +44,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/RTPortableServer/POA:1.0",
     "POA");
-  
+
 namespace RTPortableServer
 {
   ::CORBA::TypeCode_ptr const _tc_POA =
@@ -77,7 +77,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<RTPortableServer::POA>::demarshal_value (TAO_InputCDR &)
diff --git a/TAO/tao/RTScheduler.mpc b/TAO/tao/RTScheduler.mpc
index cf7725ce8e0..d1f544763f0 100644
--- a/TAO/tao/RTScheduler.mpc
+++ b/TAO/tao/RTScheduler.mpc
@@ -27,6 +27,9 @@ project : taolib, rtcorba, pi, pi_server, portableserver, core, corba_messaging
     RTScheduling
   }
 
+  IDL_Files {
+  }
+
   Pkgconfig_Files {
     RTScheduling/TAO_RTScheduler.pc.in
   }
diff --git a/TAO/tao/RTScheduling/Current.cpp b/TAO/tao/RTScheduling/Current.cpp
index 139f52609f6..d8074e83f99 100644
--- a/TAO/tao/RTScheduling/Current.cpp
+++ b/TAO/tao/RTScheduling/Current.cpp
@@ -251,7 +251,7 @@ TAO_RTScheduler_Current_i*
 TAO_RTScheduler_Current::implementation (TAO_RTScheduler_Current_i* new_current)
 {
   TAO_TSS_Resources *tss =
-    TAO_TSS_RESOURCES::instance ();
+    TAO_TSS_Resources::instance ();
 
   TAO_RTScheduler_Current_i *old =
     static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_);
@@ -264,7 +264,7 @@ TAO_RTScheduler_Current_i*
 TAO_RTScheduler_Current::implementation (void)
 {
   TAO_TSS_Resources *tss =
-    TAO_TSS_RESOURCES::instance ();
+    TAO_TSS_Resources::instance ();
 
   TAO_RTScheduler_Current_i* impl =
     static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_);
@@ -407,9 +407,9 @@ TAO_RTScheduler_Current_i::begin_scheduling_segment(
       ACE_CHECK;
 
       TAO_TSS_Resources *tss =
-        TAO_TSS_RESOURCES::instance ();
+        TAO_TSS_Resources::instance ();
 
-      TAO_RTScheduler_Current_i* new_current;
+      TAO_RTScheduler_Current_i* new_current = 0;
         ACE_NEW_THROW_EX (new_current,
                           TAO_RTScheduler_Current_i (this->orb_,
                                                      this->dt_hash_,
@@ -640,7 +640,7 @@ DTTask::svc (void)
     {
 
       TAO_TSS_Resources *tss =
-        TAO_TSS_RESOURCES::instance ();
+        TAO_TSS_Resources::instance ();
 
       tss->rtscheduler_current_impl_ = this->current_;
 
@@ -765,7 +765,7 @@ void
 TAO_RTScheduler_Current_i::cleanup_current (void)
 {
   TAO_TSS_Resources *tss =
-    TAO_TSS_RESOURCES::instance ();
+    TAO_TSS_Resources::instance ();
 
   tss->rtscheduler_current_impl_ = this->previous_current_;
 
@@ -786,7 +786,7 @@ TAO_RTScheduler_Current_i::delete_all_currents (void)
     }
 
   TAO_TSS_Resources *tss =
-    TAO_TSS_RESOURCES::instance ();
+    TAO_TSS_Resources::instance ();
 
   tss->rtscheduler_current_impl_ = tss->rtscheduler_previous_current_impl_;
 }
diff --git a/TAO/tao/RTScheduling/RTSchedulerA.cpp b/TAO/tao/RTScheduling/RTSchedulerA.cpp
index 0f18cf7b3b9..a3cfd02e3c4 100644
--- a/TAO/tao/RTScheduling/RTSchedulerA.cpp
+++ b/TAO/tao/RTScheduling/RTSchedulerA.cpp
@@ -26,15 +26,15 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "RTScheduler.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Enum_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Enum_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Sequence_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/objref_typecode.cpp:76
@@ -45,7 +45,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:RTScheduling/ThreadAction:1.0",
     "ThreadAction");
-  
+
 namespace RTScheduling
 {
   ::CORBA::TypeCode_ptr const _tc_ThreadAction =
@@ -61,7 +61,7 @@ static char const * const _tao_enumerators_RTScheduling_DistributableThread_DT_S
   {
     "ACTIVE",
     "CANCELLED"
-    
+
   };
 
 static TAO::TypeCode::Enum<char const *,
@@ -72,7 +72,7 @@ static TAO::TypeCode::Enum<char const *,
     "DT_State",
     _tao_enumerators_RTScheduling_DistributableThread_DT_State,
     2);
-  
+
 ::CORBA::TypeCode_ptr const RTScheduling::DistributableThread::_tc_DT_State =
   &_tao_tc_RTScheduling_DistributableThread_DT_State;
 
@@ -85,7 +85,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:RTScheduling/DistributableThread:1.0",
     "DistributableThread");
-  
+
 namespace RTScheduling
 {
   ::CORBA::TypeCode_ptr const _tc_DistributableThread =
@@ -108,7 +108,7 @@ static TAO::TypeCode::Struct<char const *,
     "UNSUPPORTED_SCHEDULING_DISCIPLINE",
     _tao_fields_RTScheduling_Current_UNSUPPORTED_SCHEDULING_DISCIPLINE,
     0);
-  
+
 ::CORBA::TypeCode_ptr const RTScheduling::Current::_tc_UNSUPPORTED_SCHEDULING_DISCIPLINE =
   &_tao_tc_RTScheduling_Current_UNSUPPORTED_SCHEDULING_DISCIPLINE;
 
@@ -133,10 +133,10 @@ namespace TAO
         CORBA::tk_sequence,
         &CORBA::_tc_octet,
         0U);
-      
+
     ::CORBA::TypeCode_ptr const tc_RTScheduling_Current_IdType_0 =
       &RTScheduling_Current_IdType_0;
-    
+
   }
 }
 
@@ -151,7 +151,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:RTScheduling/Current/IdType:1.0",
     "IdType",
     &TAO::TypeCode::tc_RTScheduling_Current_IdType_0);
-  
+
 ::CORBA::TypeCode_ptr const RTScheduling::Current::_tc_IdType =
   &_tao_tc_RTScheduling_Current_IdType;
 
@@ -176,10 +176,10 @@ namespace TAO
         CORBA::tk_sequence,
         &CORBA::_tc_string,
         0U);
-      
+
     ::CORBA::TypeCode_ptr const tc_RTScheduling_Current_NameList_0 =
       &RTScheduling_Current_NameList_0;
-    
+
   }
 }
 
@@ -194,7 +194,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:RTScheduling/Current/NameList:1.0",
     "NameList",
     &TAO::TypeCode::tc_RTScheduling_Current_NameList_0);
-  
+
 ::CORBA::TypeCode_ptr const RTScheduling::Current::_tc_NameList =
   &_tao_tc_RTScheduling_Current_NameList;
 
@@ -207,7 +207,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:RTScheduling/Current:1.0",
     "Current");
-  
+
 namespace RTScheduling
 {
   ::CORBA::TypeCode_ptr const _tc_Current =
@@ -225,7 +225,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:RTScheduling/ResourceManager:1.0",
     "ResourceManager");
-  
+
 namespace RTScheduling
 {
   ::CORBA::TypeCode_ptr const _tc_ResourceManager =
@@ -248,7 +248,7 @@ static TAO::TypeCode::Struct<char const *,
     "INCOMPATIBLE_SCHEDULING_DISCIPLINES",
     _tao_fields_RTScheduling_Scheduler_INCOMPATIBLE_SCHEDULING_DISCIPLINES,
     0);
-  
+
 ::CORBA::TypeCode_ptr const RTScheduling::Scheduler::_tc_INCOMPATIBLE_SCHEDULING_DISCIPLINES =
   &_tao_tc_RTScheduling_Scheduler_INCOMPATIBLE_SCHEDULING_DISCIPLINES;
 
@@ -261,7 +261,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:RTScheduling/Scheduler:1.0",
     "Scheduler");
-  
+
 namespace RTScheduling
 {
   ::CORBA::TypeCode_ptr const _tc_Scheduler =
diff --git a/TAO/tao/RTScheduling/RTSchedulerC.cpp b/TAO/tao/RTScheduling/RTSchedulerC.cpp
index e21d1a8c523..464069748a1 100644
--- a/TAO/tao/RTScheduling/RTSchedulerC.cpp
+++ b/TAO/tao/RTScheduling/RTSchedulerC.cpp
@@ -45,20 +45,21 @@
 // Arg traits specializations.
 namespace TAO
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:539
 
 #if !defined (_CORBA_POLICYLIST__ARG_TRAITS_CS_)
 #define _CORBA_POLICYLIST__ARG_TRAITS_CS_
-  
+
   template<>
   class Arg_Traits<CORBA::PolicyList>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::PolicyList,
             CORBA::PolicyList_var,
-            CORBA::PolicyList_out
+            CORBA::PolicyList_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::PolicyList>
           >
   {
   };
@@ -138,7 +139,7 @@ RTScheduling::ThreadAction::_duplicate (ThreadAction_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
diff --git a/TAO/tao/RTScheduling/RTScheduler_includeA.h b/TAO/tao/RTScheduling/RTScheduler_includeA.h
new file mode 100644
index 00000000000..d5d3403e8ef
--- /dev/null
+++ b/TAO/tao/RTScheduling/RTScheduler_includeA.h
@@ -0,0 +1,96 @@
+// -*- 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/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// C:\ACElatest\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:186
+
+#ifndef _TAO_IDL_RTSCHEDULER_INCLUDEA_H_
+#define _TAO_IDL_RTSCHEDULER_INCLUDEA_H_
+
+#include "tao/ORB.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/CDR.h"
+#include "tao/Environment.h"
+
+#include "../RTScheduling/RTScheduler.h"
+
+#if defined (TAO_EXPORT_MACRO)
+#undef TAO_EXPORT_MACRO
+#endif
+#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
+#endif /* TAO_EXPORT_NESTED_CLASSES */
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#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
+// C:\ACElatest\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:58
+
+// Traits specializations.
+namespace TAO
+{
+}
+
+// TAO_IDL - Generated from
+// C:\ACElatest\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
+
+#ifndef __ACE_INLINE__
+
+// TAO_IDL - Generated from
+// C:\ACElatest\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
+
+#endif /* __ACE_INLINE__ */
+
+// TAO_IDL - Generated from
+// C:\ACElatest\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1050
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
+#endif /* ifndef */
+
diff --git a/TAO/tao/RTScheduling/Request_Interceptor.cpp b/TAO/tao/RTScheduling/Request_Interceptor.cpp
index fcff3bf6ec9..2b5358489a6 100644
--- a/TAO/tao/RTScheduling/Request_Interceptor.cpp
+++ b/TAO/tao/RTScheduling/Request_Interceptor.cpp
@@ -5,8 +5,8 @@
 #include "Distributable_Thread.h"
 #include "tao/TSS_Resources.h"
 #include "tao/debug.h"
-#include "tao/Any.h"
-#include "tao/TypeCode.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/ORB_Constants.h"
 #include "ace/OS_NS_string.h"
 
@@ -36,7 +36,7 @@ Client_Interceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri
   TAO_RTScheduler_Current_i *new_current = 0;
   TAO_RTScheduler_Current_i *current = 0;
 
-  TAO_TSS_Resources *tss = TAO_TSS_RESOURCES::instance ();
+  TAO_TSS_Resources *tss = TAO_TSS_Resources::instance ();
 
   current = static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_);
 
@@ -129,7 +129,7 @@ Client_Interceptor::send_poll (PortableInterceptor::ClientRequestInfo_ptr ri
 
     TAO_RTScheduler_Current_i *current = 0;
 
-    TAO_TSS_Resources *tss = TAO_TSS_RESOURCES::instance ();
+    TAO_TSS_Resources *tss = TAO_TSS_Resources::instance ();
 
     current = static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_);
     if (current != 0)
@@ -148,7 +148,7 @@ Client_Interceptor::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
 
   TAO_RTScheduler_Current_i *current = 0;
 
-  TAO_TSS_Resources *tss = TAO_TSS_RESOURCES::instance ();
+  TAO_TSS_Resources *tss = TAO_TSS_Resources::instance ();
 
   current = static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_);
   if (current != 0)
@@ -168,7 +168,7 @@ Client_Interceptor::receive_exception (PortableInterceptor::ClientRequestInfo_pt
 
   TAO_RTScheduler_Current_i *current = 0;
 
-  TAO_TSS_Resources *tss = TAO_TSS_RESOURCES::instance ();
+  TAO_TSS_Resources *tss = TAO_TSS_Resources::instance ();
 
   current = static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_);
 
@@ -232,7 +232,7 @@ Client_Interceptor::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri
 
   TAO_RTScheduler_Current_i *current = 0;
 
-  TAO_TSS_Resources *tss = TAO_TSS_RESOURCES::instance ();
+  TAO_TSS_Resources *tss = TAO_TSS_Resources::instance ();
 
   current = static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_);
   if (current != 0)
@@ -376,7 +376,7 @@ Server_Interceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr
   // Install new current in the ORB and store the previous current
   // implementation
   // current->implementation (new_current)
-  TAO_TSS_Resources *tss = TAO_TSS_RESOURCES::instance ();
+  TAO_TSS_Resources *tss = TAO_TSS_Resources::instance ();
 
   tss->rtscheduler_previous_current_impl_ = this->current_->implementation (new_current);
 }
@@ -393,7 +393,7 @@ Server_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
   TAO_RTScheduler_Current_i *current = 0;
   TAO_RTScheduler_Current_i *prev_current = 0;
 
-  TAO_TSS_Resources *tss = TAO_TSS_RESOURCES::instance ();
+  TAO_TSS_Resources *tss = TAO_TSS_Resources::instance ();
 
   current = static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_);
   if (current != 0)
@@ -444,7 +444,7 @@ Server_Interceptor::send_exception (PortableInterceptor::ServerRequestInfo_ptr r
 
   TAO_RTScheduler_Current_i *current = 0;
 
-  TAO_TSS_Resources *tss = TAO_TSS_RESOURCES::instance ();
+  TAO_TSS_Resources *tss = TAO_TSS_Resources::instance ();
 
   current = static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_);
   if (current != 0)
@@ -469,7 +469,7 @@ Server_Interceptor::send_other (PortableInterceptor::ServerRequestInfo_ptr ri
 
   TAO_RTScheduler_Current_i *current = 0;
 
-  TAO_TSS_Resources *tss = TAO_TSS_RESOURCES::instance ();
+  TAO_TSS_Resources *tss = TAO_TSS_Resources::instance ();
 
   current = static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_);
   if (current != 0)
diff --git a/TAO/tao/Reactive_Flushing_Strategy.h b/TAO/tao/Reactive_Flushing_Strategy.h
index 66b78566556..27041a0be5a 100644
--- a/TAO/tao/Reactive_Flushing_Strategy.h
+++ b/TAO/tao/Reactive_Flushing_Strategy.h
@@ -26,7 +26,7 @@
  *
  * @brief Implement a flushing strategy that uses the reactor.
  */
-class TAO_Export TAO_Reactive_Flushing_Strategy : public TAO_Flushing_Strategy
+class TAO_Reactive_Flushing_Strategy : public TAO_Flushing_Strategy
 {
 public:
   virtual int schedule_output (TAO_Transport *transport);
diff --git a/TAO/tao/Recursive_Type_TypeCode.cpp b/TAO/tao/Recursive_Type_TypeCode.cpp
deleted file mode 100644
index abe5b4df051..00000000000
--- a/TAO/tao/Recursive_Type_TypeCode.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-// $Id$
-
-#include "tao/Recursive_Type_TypeCode.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/Recursive_Type_TypeCode.inl"
-#endif  /* __ACE_INLINE__ */
-
-#include "tao/CDR.h"
-
-
-template <class TypeCodeBase, typename TypeCodeType, typename MemberArrayType>
-bool
-TAO::TypeCode::Recursive_Type<TypeCodeBase,
-                              TypeCodeType,
-                              MemberArrayType>::tao_marshal (
-  TAO_OutputCDR & cdr,
-  CORBA::ULong offset) const
-{
-  ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX,
-                    guard,
-                    this->lock_,
-                    false);
-
-  // Top-level TypeCode case.
-  if (!(this->in_recursion_))
-    {
-      this->in_recursion_ = true;
-
-      // Starting offset should point to the CORBA::TCKind value.
-
-      // Note that this doesn't need to take into account alignment
-      // padding since CORBA::TCKind (encoded as a CORBA::ULong) is
-      // already aligned on the appropriate boundary, and since the
-      // CORBA::TCKind was the last thing marshaled into the CDR
-      // stream before getting here.
-      offset = sizeof (CORBA::ULong);
-
-      // Reset recursion flag to false in an exception-safe manner once
-      // marshaling is done.
-      //
-      // Only reset the recursion flag at the top-level.
-      Reset flag (this->in_recursion_);
-
-      return this->TypeCodeBase::tao_marshal (cdr, offset);
-    }
-
-  // Recursive/indirected TypeCode case.
-
-//   ACE_ASSERT (offset > 4
-//               && offset < static_cast<CORBA::ULong> (ACE_INT32_MAX));
-
-  return (cdr << -static_cast<CORBA::Long> (offset));
-}
-
-template <class TypeCodeBase, typename TypeCodeType, typename MemberArrayType>
-CORBA::Boolean
-TAO::TypeCode::Recursive_Type<TypeCodeBase,
-                              TypeCodeType,
-                              MemberArrayType>::equal_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX,
-                    guard,
-                    this->lock_,
-                    false);
-
-  // Top-level TypeCode case.
-  if (!(this->in_recursion_))
-    {
-      this->in_recursion_ = true;
-
-      // Reset recursion flag to false in an exception-safe manner once
-      // equality determination is done.
-      //
-      // Only reset the recursion flag at the top-level.
-      Reset flag (this->in_recursion_);
-
-      return this->TypeCodeBase::equal_i (tc
-                                          ACE_ENV_ARG_PARAMETER);
-    }
-
-  // Nothing else to do.
-  return true;
-}
-
-template <class TypeCodeBase, typename TypeCodeType, typename MemberArrayType>
-CORBA::Boolean
-TAO::TypeCode::Recursive_Type<TypeCodeBase,
-                              TypeCodeType,
-                              MemberArrayType>::equivalent_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX,
-                    guard,
-                    this->lock_,
-                    false);
-
-  // Top-level TypeCode case.
-  if (!(this->in_recursion_))
-    {
-      this->in_recursion_ = true;
-
-      // Reset recursion flag to false in an exception-safe manner once
-      // equivalence determination is done.
-      //
-      // Only reset the recursion flag at the top-level.
-      Reset flag (this->in_recursion_);
-
-      return this->TypeCodeBase::equivalent_i (tc
-                                               ACE_ENV_ARG_PARAMETER);
-    }
-
-  // Nothing else to do.
-  return true;
-}
-
-template <class TypeCodeBase, typename TypeCodeType, typename MemberArrayType>
-bool
-TAO::TypeCode::Recursive_Type<TypeCodeBase,
-                              TypeCodeType,
-                              MemberArrayType>::tao_marshal_kind (
-  TAO_OutputCDR & cdr) const
-{
-  ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX,
-                    guard,
-                    this->lock_,
-                    false);
-
-  // Top-level TypeCode case.
-  if (!(this->in_recursion_))
-    return this->ACE_NESTED_CLASS (CORBA, TypeCode)::tao_marshal_kind (cdr);
-
-  // Recursive/indirected TypeCode case.
-  CORBA::ULong const indirection_kind = 0xffffffff;
-
-  return (cdr << indirection_kind);
-}
diff --git a/TAO/tao/Recursive_Type_TypeCode.h b/TAO/tao/Recursive_Type_TypeCode.h
deleted file mode 100644
index 742a51c87a0..00000000000
--- a/TAO/tao/Recursive_Type_TypeCode.h
+++ /dev/null
@@ -1,214 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Recursive_Type_TypeCode.h
- *
- *  $Id$
- *
- *  Header file for a recursive type (@c struct, @c union or
- *  @c valuetype) CORBA::TypeCode.
- *
- *  @author Ossama Othman
- */
-//=============================================================================
-
-#ifndef TAO_RECURSIVE_TYPE_TYPECODE_H
-#define TAO_RECURSIVE_TYPE_TYPECODE_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/Recursive_Thread_Mutex.h"
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-
-    /**
-     * @class Recursive_Type
-     *
-     * @brief Recursive type @c TypeCode decorator template.
-     *
-     * This class template decorates the underlying @c TypeCode
-     * implementation @a TypeCodeBase to provide support for IDL
-     * defined recursive types.  Only IDL an @c struct, @c union or
-     * @c valuetype may be recursive, which is why this decorator only
-     * supports constructors for the corresponding @c TypeCode
-     * implementations.
-     */
-    template <class TypeCodeBase,
-              typename TypeCodeType,
-              typename MemberArrayType>
-    class Recursive_Type
-      : public TypeCodeBase
-    {
-    public:
-
-      /// Recursive @c struct constructor.
-      Recursive_Type (CORBA::TCKind kind,
-                      char const * id,
-                      char const * name,
-                      MemberArrayType const & fields,
-                      CORBA::ULong nfields);
-
-      /// Recursive @c union constructor.
-      Recursive_Type (char const * id,
-                      char const * name,
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x572)
-                      // Borland C++ currently can't handle a
-                      // reference to const pointer to const
-                      // CORBA::TypeCode_ptr.
-                      TypeCodeType discriminant_type,
-#else
-                      TypeCodeType const & discriminant_type,
-#endif
-                      MemberArrayType const & cases,
-                      CORBA::ULong ncases,
-                      CORBA::Long default_index);
-
-      /// Recursive @c valuetype constructor.
-      Recursive_Type (CORBA::TCKind kind,
-                      char const * id,
-                      char const * name,
-                      CORBA::ValueModifier modifier,
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x572)
-                      // Borland C++ currently can't handle a
-                      // reference to const pointer to const
-                      // CORBA::TypeCode_ptr.
-                      TypeCodeType concrete_base,
-#else
-                      TypeCodeType const & concrete_base,
-#endif
-                      MemberArrayType const & fields,
-                      CORBA::ULong nfields);
-
-      /// Dynamic @c Recursive_Type TypeCode constructor.
-      Recursive_Type (CORBA::TCKind kind,
-                      char const * id);
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @par
-       *
-       * These are recursive type @c TypeCode marshaling operation
-       * overrides.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal_kind (TAO_OutputCDR & cdr) const;
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      //@}
-
-    protected:
-
-      /**
-       * @name TAO @c CORBA::TypeCode Template Methods
-       *
-       * Recursive type @c CORBA::TypeCode -specific
-       * template methods.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      //@}
-
-
-    public:
-
-      /// Set @c struct @c TypeCode parameters.
-      void struct_parameters (char const * name,
-                              MemberArrayType const & fields,
-                              CORBA::ULong nfields);
-
-      /// Set @c union @c TypeCode parameters.
-      void union_parameters (
-                             char const * name,
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x572)
-                             // Borland C++ currently can't handle a
-                             // reference to const pointer to const
-                             // CORBA::TypeCode_ptr.
-                             TypeCodeType discriminant_type,
-#else
-                             TypeCodeType const & discriminant_type,
-#endif
-                             MemberArrayType const & cases,
-                             CORBA::ULong ncases,
-                             CORBA::Long default_index);
-
-      /// Set @c valuetype or @c eventtype @c TypeCode parameters.
-      void valuetype_parameters (char const * name,
-                                 CORBA::ValueModifier modifier,
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x572)
-                                 // Borland C++ currently can't handle a
-                                 // reference to const pointer to const
-                                 // CORBA::TypeCode_ptr.
-                                 TypeCodeType concrete_base,
-#else
-                                 TypeCodeType const & concrete_base,
-#endif
-                                 MemberArrayType const & fields,
-                                 CORBA::ULong nfields);
-
-    private:
-
-      /**
-       * @class Reset
-       *
-       * @brief Reset flag to false in an exception-safe manner.
-       *
-       * Reset flag to false in an exception-safe manner.
-       */
-      class Reset
-      {
-      public:
-        Reset (bool & flag) : flag_ (flag) { }
-        ~Reset (void) { this->flag_ = false; }
-      private:
-        bool & flag_;
-      };
-
-    private:
-
-      /// Internal state thread synchronization mutex.
-      mutable TAO_SYNCH_RECURSIVE_MUTEX lock_;
-
-      /// @c true if equality or equivalence is being determined
-      /// recursively.
-      /**
-       * This flag is used to prevent @c TypeCode equality and
-       * equivalence operations from recursing indefinitely.
-       */
-      mutable bool in_recursion_;
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/Recursive_Type_TypeCode.inl"
-#endif  /* __ACE_INLINE__ */
-
-#ifdef ACE_TEMPLATES_REQUIRE_SOURCE
-# include "tao/Recursive_Type_TypeCode.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
-# pragma implementation ("Recursive_Type_TypeCode.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_RECURSIVE_TYPE_TYPECODE_H */
diff --git a/TAO/tao/Recursive_Type_TypeCode.inl b/TAO/tao/Recursive_Type_TypeCode.inl
deleted file mode 100644
index 7f7a5ea6fe8..00000000000
--- a/TAO/tao/Recursive_Type_TypeCode.inl
+++ /dev/null
@@ -1,149 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-template <class TypeCodeBase, typename TypeCodeType, typename MemberArrayType>
-ACE_INLINE
-TAO::TypeCode::Recursive_Type<TypeCodeBase,
-                              TypeCodeType,
-                              MemberArrayType>::Recursive_Type (
-  CORBA::TCKind kind,
-  char const * id,
-  char const * name,
-  MemberArrayType const & fields,
-  CORBA::ULong nfields)
-  : TypeCodeBase (kind, id, name, fields, nfields)
-  , lock_ ()
-  , in_recursion_ (false)
-{
-  // ACE_ASSERT (kind != CORBA::tk_except);
-}
-
-template <class TypeCodeBase, typename TypeCodeType, typename MemberArrayType>
-ACE_INLINE
-TAO::TypeCode::Recursive_Type<TypeCodeBase,
-                              TypeCodeType,
-                              MemberArrayType>::Recursive_Type (
-  char const * id,
-  char const * name,
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x572)
-  TypeCodeType discriminant_type,
-#else
-  TypeCodeType const & discriminant_type,
-#endif
-  MemberArrayType const & cases,
-  CORBA::ULong ncases,
-  CORBA::Long default_index)
-  : TypeCodeBase (id,
-                  name,
-                  discriminant_type,
-                  cases,
-                  ncases,
-                  default_index)
-  , lock_ ()
-  , in_recursion_ (false)
-{
-}
-
-template <class TypeCodeBase, typename TypeCodeType, typename MemberArrayType>
-ACE_INLINE
-TAO::TypeCode::Recursive_Type<TypeCodeBase,
-                              TypeCodeType,
-                              MemberArrayType>::Recursive_Type (
-  CORBA::TCKind kind,
-  char const * id,
-  char const * name,
-  CORBA::ValueModifier modifier,
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x572)
-  TypeCodeType concrete_base,
-#else
-  TypeCodeType const & concrete_base,
-#endif
-  MemberArrayType const & fields,
-  CORBA::ULong nfields)
-  : TypeCodeBase (kind,
-                  id,
-                  name,
-                  modifier,
-                  concrete_base,
-                  fields,
-                  nfields)
-  , lock_ ()
-  , in_recursion_ (false)
-{
-}
-
-template <class TypeCodeBase, typename TypeCodeType, typename MemberArrayType>
-ACE_INLINE
-TAO::TypeCode::Recursive_Type<TypeCodeBase,
-                              TypeCodeType,
-                              MemberArrayType>::Recursive_Type (
-  CORBA::TCKind kind,
-  char const * id)
-  : TypeCodeBase (kind, id)
-  , lock_ ()
-  , in_recursion_ (false)
-{
-//   ACE_ASSERT (kind == CORBA::tk_struct
-//               || kind == CORBA::tk_union
-//               || kind == CORBA::tk_value
-//               || kind == CORBA::tk_event);
-}
-
-template <class TypeCodeBase, typename TypeCodeType, typename MemberArrayType>
-ACE_INLINE void
-TAO::TypeCode::Recursive_Type<TypeCodeBase,
-                              TypeCodeType,
-                              MemberArrayType>::struct_parameters (
-  char const * name,
-  MemberArrayType const & fields,
-  CORBA::ULong nfields)
-{
-  this->base_attributes_.name (name);
-  this->fields_  = fields;
-  this->nfields_ = nfields;
-}
-
-template <class TypeCodeBase, typename TypeCodeType, typename MemberArrayType>
-ACE_INLINE void
-TAO::TypeCode::Recursive_Type<TypeCodeBase,
-                              TypeCodeType,
-                              MemberArrayType>::union_parameters (
-  char const * name,
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x572)
-  TypeCodeType discriminant_type,
-#else
-  TypeCodeType const & discriminant_type,
-#endif
-  MemberArrayType const & cases,
-  CORBA::ULong ncases,
-  CORBA::Long default_index)
-{
-  this->base_attributes_.name (name);
-  this->discriminant_type_ = discriminant_type;
-  this->cases_             = cases;
-  this->ncases_            = ncases;
-  this->default_index_     = default_index;
-}
-
-template <class TypeCodeBase, typename TypeCodeType, typename MemberArrayType>
-ACE_INLINE void
-TAO::TypeCode::Recursive_Type<TypeCodeBase,
-                              TypeCodeType,
-                              MemberArrayType>::valuetype_parameters (
-  char const * name,
-  CORBA::ValueModifier modifier,
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x572)
-  TypeCodeType concrete_base,
-#else
-  TypeCodeType const & concrete_base,
-#endif
-  MemberArrayType const & fields,
-  CORBA::ULong nfields)
-{
-  this->base_attributes_.name (name);
-  this->type_modifier_ = modifier;
-  this->concrete_base_ = concrete_base;
-  this->fields_        = fields;
-  this->nfields_       = nfields;
-}
diff --git a/TAO/tao/RefCount_Policy_Traits.h b/TAO/tao/RefCount_Policy_Traits.h
deleted file mode 100644
index 6f4ea6a2e00..00000000000
--- a/TAO/tao/RefCount_Policy_Traits.h
+++ /dev/null
@@ -1,107 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    RefCount_Policy_Traits.h
- *
- *  $Id$
- *
- *  Header file for TAO's reference count policy (unrelated to CORBA
- *  policies) traits.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_REFCOUNT_POLICY_TRAITS_H
-#define TAO_REFCOUNT_POLICY_TRAITS_H
-
-#include /**/ "ace/pre.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/CORBA_methods.h"
-
-
-namespace TAO
-{
-  class Null_RefCount_Policy;
-  class True_RefCount_Policy;
-
-#if !defined (_MSC_VER) || (_MSC_VER >= 1310)
-  /**
-   * @struct RefCount_Policy_Traits
-   *
-   * @brief Compile-time selection of RefCount_Policy operations,
-   *        etc.
-   *
-   * This primary template is used to select RefCount_Policy
-   * operations, etc at compile-time based on the reference counting
-   * policy and type being operated on.
-   *
-   * @note This merely a forward declaration since we really only care
-   *       about the partial specializations below.
-   */
-  template<class RefCountPolicy, typename TypePtr>
-  struct RefCount_Policy_Traits;
-
-  /**
-   * @struct RefCount_Policy_Traits
-   *
-   * @brief No-op reference count policy traits.
-   *
-   * This partial specialization performs no-op reference counting
-   * operations on values of type @a TypePtr if the @a RefCountPolicy
-   * first argument is @c Null_RefCount_Policy.
-   */
-  template<typename TypePtr>
-  struct RefCount_Policy_Traits<Null_RefCount_Policy, TypePtr>
-  {
-    /// No-op "release" operation.
-    static void release (TypePtr) { }
-  };
-
-  template<typename TypePtr>
-  struct RefCount_Policy_Traits<True_RefCount_Policy, TypePtr>
-  {
-    /// Call actual "release" operation on @a ptr value.
-    static void release (TypePtr ptr)
-    {
-      CORBA::release (ptr);
-    }
-  };
-
-#else
-
-  // MSVC++ 6 can't handle partial template specializations so fall
-  // back on an alternate implementation.
-
-  template<class RefCountPolicy> struct RefCount_Policy_Traits;
-
-  template<>
-  struct RefCount_Policy_Traits<Null_RefCount_Policy>
-  {
-    static bool is_refcounted (void)
-    {
-      return false;
-    }
-  };
-
-  template<>
-  struct RefCount_Policy_Traits<True_RefCount_Policy>
-  {
-    static bool is_refcounted (void)
-    {
-      return true;
-    }
-  };
-
-#endif  /* !_MSC_VER || _MSC_VER >= 1310 */
-
-}  // End namespace TAO
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_REFCOUNT_POLICY_TRAITS_H */
diff --git a/TAO/tao/Refcounted_ObjectKey.h b/TAO/tao/Refcounted_ObjectKey.h
index a001a56f4b5..297ec6fd654 100644
--- a/TAO/tao/Refcounted_ObjectKey.h
+++ b/TAO/tao/Refcounted_ObjectKey.h
@@ -15,12 +15,14 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/Object_KeyC.h"
+#include "tao/TAO_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Object_KeyC.h"
+
 namespace TAO
 {
   /**
@@ -29,8 +31,8 @@ namespace TAO
    * @brief A wrapper class that ties together a refcount to an
    * ObjectKey.
    *
-   * The refounts in this class is manipulated within the context of
-   * the lock in the TAO::ObjectKey_Table. Manipulating the refcounts
+   * The refcount in this class is manipulated within the context of
+   * the lock in the TAO::ObjectKey_Table. Manipulating the refcount
    * from anywhere else is strictly forbidden.
    */
   class TAO_Export Refcounted_ObjectKey
diff --git a/TAO/tao/Remote_Object_Proxy_Broker.cpp b/TAO/tao/Remote_Object_Proxy_Broker.cpp
index d90e709d899..3ec43f69ed7 100644
--- a/TAO/tao/Remote_Object_Proxy_Broker.cpp
+++ b/TAO/tao/Remote_Object_Proxy_Broker.cpp
@@ -1,4 +1,5 @@
 #include "Remote_Object_Proxy_Broker.h"
+#include "CORBA_String.h"
 #include "UB_String_Arguments.h"
 #include "Special_Basic_Arguments.h"
 #include "Invocation_Adapter.h"
diff --git a/TAO/tao/Sequence_TypeCode.cpp b/TAO/tao/Sequence_TypeCode.cpp
deleted file mode 100644
index dcf7b3d72ca..00000000000
--- a/TAO/tao/Sequence_TypeCode.cpp
+++ /dev/null
@@ -1,148 +0,0 @@
-// $Id$
-
-#ifndef TAO_SEQUENCE_TYPECODE_CPP
-#define TAO_SEQUENCE_TYPECODE_CPP
-
-#include "tao/Sequence_TypeCode.h"
-#include "tao/CDR.h"
-#include "tao/TypeCode_Traits.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/Sequence_TypeCode.inl"
-#endif  /* !__ACE_INLINE__ */
-
-
-template <typename TypeCodeType, class RefCountPolicy>
-bool
-TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::tao_marshal (
-  TAO_OutputCDR & cdr,
-  CORBA::ULong offset) const
-{
-  // A tk_array or tk_sequence TypeCode has a "complex" parameter list
-  // type (see Table 15-2 in Section 15.3.5.1 "TypeCode" in the CDR
-  // section of the CORBA specification), meaning that it must be
-  // marshaled into a CDR encapsulation.
-
-  // Create a CDR encapsulation.
-  TAO_OutputCDR enc;
-
-  // Account for the encoded CDR encapsulation length and byte order.
-  //
-  // Aligning on an octet since the next value after the CDR
-  // encapsulation length will always be the byte order octet/boolean
-  // in this case.
-  offset = ACE_align_binary (offset + 4,
-                             ACE_CDR::OCTET_ALIGN);
-
-  return
-    enc << TAO_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER)
-    && marshal (enc,
-                Traits<TypeCodeType>::get_typecode (this->content_type_),
-                offset + enc.total_length ())
-    && enc << this->length_
-    && cdr << static_cast<CORBA::ULong> (enc.total_length ())
-    && cdr.write_octet_array_mb (enc.begin ());
-}
-
-template <typename TypeCodeType, class RefCountPolicy>
-void
-TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::tao_duplicate (void)
-{
-  this->RefCountPolicy::add_ref ();
-}
-
-template <typename TypeCodeType, class RefCountPolicy>
-void
-TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::tao_release (void)
-{
-  this->RefCountPolicy::remove_ref ();
-}
-
-template <typename TypeCodeType, class RefCountPolicy>
-CORBA::Boolean
-TAO::TypeCode::Sequence<TypeCodeType,
-                        RefCountPolicy>::equal_i (CORBA::TypeCode_ptr tc
-                                                  ACE_ENV_ARG_DECL) const
-{
-  // The following calls won't throw since CORBA::TypeCode::equal()
-  // has already established the kind of tc is the same as our kind.
-  CORBA::ULong const tc_length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (this->length_ != tc_length)
-    return 0;
-
-  CORBA::TypeCode_var rhs_content_type =
-    tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return
-    Traits<TypeCodeType>::get_typecode (this->content_type_)->equal (
-      rhs_content_type.in ()
-      ACE_ENV_ARG_PARAMETER);
-}
-
-template <typename TypeCodeType, class RefCountPolicy>
-CORBA::Boolean
-TAO::TypeCode::Sequence<TypeCodeType,
-                        RefCountPolicy>::equivalent_i (CORBA::TypeCode_ptr tc
-                                                       ACE_ENV_ARG_DECL) const
-{
-  // The following calls won't throw since CORBA::TypeCode::equal()
-  // has already established the kind of tc is the same as our kind.
-  CORBA::ULong const tc_length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (this->length_ != tc_length)
-    return 0;
-
-  CORBA::TypeCode_var rhs_content_type =
-    tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return
-    Traits<TypeCodeType>::get_typecode (this->content_type_)->equivalent (
-      rhs_content_type.in ()
-      ACE_ENV_ARG_PARAMETER);
-}
-
-template <typename TypeCodeType, class RefCountPolicy>
-CORBA::TypeCode_ptr
-TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Already compact since tk_sequence and tk_array TypeCodes have no
-  // name or member names, meaning that we can simply call
-  // _duplicate() on this TypeCode.
-
-  // @@ There is a potential problem here if this TypeCode is a static
-  //    and const since it may have been placed in read-only memory by
-  //    the compiler.  A const_cast<> can return undefined results in
-  //    that case.
-
-  CORBA::TypeCode_ptr mutable_tc =
-    const_cast<TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy> *> (this);
-
-  return CORBA::TypeCode::_duplicate (mutable_tc);
-}
-
-template <typename TypeCodeType, class RefCountPolicy>
-CORBA::ULong
-TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::length_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->length_;
-}
-
-template <typename TypeCodeType, class RefCountPolicy>
-CORBA::TypeCode_ptr
-TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::content_type_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return
-    CORBA::TypeCode::_duplicate (
-      Traits<TypeCodeType>::get_typecode (this->content_type_));
-}
-
-
-#endif  /* TAO_SEQUENCE_TYPECODE_CPP */
diff --git a/TAO/tao/Sequence_TypeCode.h b/TAO/tao/Sequence_TypeCode.h
deleted file mode 100644
index 63b576bd216..00000000000
--- a/TAO/tao/Sequence_TypeCode.h
+++ /dev/null
@@ -1,134 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Sequence_TypeCode.h
- *
- *  $Id$
- *
- *  Header file for @c tk_sequence and @c tk_array @c CORBA::TypeCodes.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_SEQUENCE_TYPECODE_H
-#define TAO_SEQUENCE_TYPECODE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TypeCode.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-
-    /**
-     * @class Sequence
-     *
-     * @brief @c CORBA::TypeCode implementation for OMG IDL
-     *        @c sequence and @c array types.
-     *
-     * This class implements a @c CORBA::TypeCode for OMG IDL
-     * @c sequence and array types.
-     */
-    template <typename TypeCodeType, class RefCountPolicy>
-    class Sequence
-      : public CORBA::TypeCode
-      , private RefCountPolicy
-    {
-    public:
-
-      /// Constructor.
-      Sequence (CORBA::TCKind kind,
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x572)
-                // Borland C++ currently can't handle a reference to
-                // const pointer to const CORBA::TypeCode_ptr
-                TypeCodeType content_type,
-#else
-                TypeCodeType const & content_type,
-#endif
-                CORBA::ULong length);
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
-      //@}
-
-    protected:
-
-      /**
-       * @name @c TAO CORBA::TypeCode Template Methods
-       *
-       * @c CORBA::TypeCode template methods specific to @c tk_sequence
-       * @c TypeCodes.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::ULong length_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr content_type_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-
-    private:
-
-      /// Element type of the sequence.
-      /**
-       * A pointer to the @c CORBA::TypeCode_ptr rather than the
-       * @c CORBA::TypeCode_ptr itself is stored since that address is
-       * well-defined.  We may not know the value of the @c
-       * CORBA::TypeCode_ptr when creating this @c Field statically at
-       * compile-time, hence the indirection.
-       *
-       * @note This @c TypeCode is released upon destruction of this
-       *       @c TypeCode::Sequence.
-       */
-      TypeCodeType const content_type_;
-
-      /// Length of the @c sequence or array.  A length of zero
-      /// indicates an unbounded @c sequence.
-      CORBA::ULong const length_;
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/Sequence_TypeCode.inl"
-#endif  /* __ACE_INLINE__ */
-
-#ifdef ACE_TEMPLATES_REQUIRE_SOURCE
-# include "tao/Sequence_TypeCode.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
-# pragma implementation ("Sequence_TypeCode.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_SEQUENCE_TYPECODE_H */
diff --git a/TAO/tao/Sequence_TypeCode.inl b/TAO/tao/Sequence_TypeCode.inl
deleted file mode 100644
index 81e7add5646..00000000000
--- a/TAO/tao/Sequence_TypeCode.inl
+++ /dev/null
@@ -1,23 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-template <typename TypeCodeType, class RefCountPolicy>
-ACE_INLINE
-TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::Sequence (
-  CORBA::TCKind kind,
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x572)
-  // Borland C++ currently can't handle a reference to
-  // const pointer to const CORBA::TypeCode_ptr
-  TypeCodeType content_type,
-#else
-  TypeCodeType const & content_type,
-#endif
-  CORBA::ULong length)
-  : CORBA::TypeCode (kind)
-  , RefCountPolicy ()
-  , content_type_ (content_type)
-  , length_ (length)
-{
-  // ACE_ASSERT (kind == CORBA::tk_array || kind == CORBA::tk_sequence);
-}
diff --git a/TAO/tao/Sequence_TypeCode_Static.cpp b/TAO/tao/Sequence_TypeCode_Static.cpp
deleted file mode 100644
index c9548ddf64f..00000000000
--- a/TAO/tao/Sequence_TypeCode_Static.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
-// $Id$
-
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/TypeCode_Traits.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/Sequence_TypeCode_Static.inl"
-#endif  /* !__ACE_INLINE__ */
-
-
-ACE_RCSID (tao,
-           Sequence_TypeCode_Static,
-           "$Id$")
-
-
-bool
-TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
-                        TAO::Null_RefCount_Policy>::tao_marshal (
-  TAO_OutputCDR & cdr,
-  CORBA::ULong offset) const
-{
-  // A tk_array or tk_sequence TypeCode has a "complex" parameter list
-  // type (see Table 15-2 in Section 15.3.5.1 "TypeCode" in the CDR
-  // section of the CORBA specification), meaning that it must be
-  // marshaled into a CDR encapsulation.
-
-  // Create a CDR encapsulation.
-  TAO_OutputCDR enc;
-
-  // Account for the encoded CDR encapsulation length and byte order.
-  //
-  // Aligning on an octet since the next value after the CDR
-  // encapsulation length will always be the byte order octet/boolean
-  // in this case.
-  offset = ACE_align_binary (offset + 4,
-                             ACE_CDR::OCTET_ALIGN);
-
-  return
-    enc << TAO_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER)
-    && marshal (enc,
-                Traits<CORBA::TypeCode_ptr const *>::get_typecode (
-                  this->content_type_),
-                offset + enc.total_length ())
-    && enc << this->length_
-    && cdr << static_cast<CORBA::ULong> (enc.total_length ())
-    && cdr.write_octet_array_mb (enc.begin ());
-}
-
-void
-TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
-                        TAO::Null_RefCount_Policy>::tao_duplicate (void)
-{
-}
-
-void
-TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
-                        TAO::Null_RefCount_Policy>::tao_release (void)
-{
-}
-
-CORBA::Boolean
-TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
-                        TAO::Null_RefCount_Policy>::equal_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // The following calls won't throw since CORBA::TypeCode::equal()
-  // has already established the kind of tc is the same as our kind.
-  CORBA::ULong const tc_length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (this->length_ != tc_length)
-    return 0;
-
-  CORBA::TypeCode_var rhs_content_type =
-    tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return
-    Traits<CORBA::TypeCode_ptr const *>::get_typecode (this->content_type_)->equal (
-      rhs_content_type.in ()
-      ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Boolean
-TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
-                        TAO::Null_RefCount_Policy>::equivalent_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // The following calls won't throw since CORBA::TypeCode::equal()
-  // has already established the kind of tc is the same as our kind.
-  CORBA::ULong const tc_length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (this->length_ != tc_length)
-    return 0;
-
-  CORBA::TypeCode_var rhs_content_type =
-    tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return
-    Traits<CORBA::TypeCode_ptr const *>::get_typecode (this->content_type_)->equivalent (
-      rhs_content_type.in ()
-      ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
-                        TAO::Null_RefCount_Policy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Already compact since tk_sequence and tk_array TypeCodes have no
-  // name or member names, meaning that we can simply call
-  // _duplicate() on this TypeCode.
-
-  // @@ There is a potential problem here if this TypeCode is a static
-  //    and const since it may have been placed in read-only memory by
-  //    the compiler.  A const_cast<> can return undefined results in
-  //    that case.
-
-  CORBA::TypeCode_ptr mutable_tc =
-    const_cast<TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
-    TAO::Null_RefCount_Policy> *> (this);
-
-  return CORBA::TypeCode::_duplicate (mutable_tc);
-}
-
-CORBA::ULong
-TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
-                        TAO::Null_RefCount_Policy>::length_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->length_;
-}
-
-CORBA::TypeCode_ptr
-TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
-                        TAO::Null_RefCount_Policy>::content_type_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return
-    CORBA::TypeCode::_duplicate (
-      Traits<CORBA::TypeCode_ptr const *>::get_typecode (this->content_type_));
-}
diff --git a/TAO/tao/Sequence_TypeCode_Static.h b/TAO/tao/Sequence_TypeCode_Static.h
deleted file mode 100644
index 43219b335fe..00000000000
--- a/TAO/tao/Sequence_TypeCode_Static.h
+++ /dev/null
@@ -1,125 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Sequence_TypeCode_Static.h
- *
- *  $Id$
- *
- *  Header file for static @c tk_sequence and @c tk_array
- *  @c CORBA::TypeCodes.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_SEQUENCE_TYPECODE_STATIC_H
-#define TAO_SEQUENCE_TYPECODE_STATIC_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TypeCode.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Null_RefCount_Policy.h"
-
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    template <typename TypeCodeType, class RefCountPolicy> class Sequence;
-
-    /**
-     * @class Sequence
-     *
-     * @brief @c CORBA::TypeCode implementation for OMG IDL
-     *        @c sequence and @c array types.
-     *
-     * This class implements a @c CORBA::TypeCode for OMG IDL
-     * @c sequence and array types.
-     */
-    template<>
-    class TAO_Export Sequence<CORBA::TypeCode_ptr const *,
-                              TAO::Null_RefCount_Policy>
-      : public CORBA::TypeCode
-      , private TAO::Null_RefCount_Policy
-    {
-    public:
-
-      /// Constructor.
-      Sequence (CORBA::TCKind kind,
-                CORBA::TypeCode_ptr const * content_type,
-                CORBA::ULong length);
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
-      //@}
-
-    protected:
-
-      /**
-       * @name @c TAO CORBA::TypeCode Template Methods
-       *
-       * @c CORBA::TypeCode template methods specific to @c tk_sequence
-       * @c TypeCodes.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::ULong length_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr content_type_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-
-    private:
-
-      /// Element type of the sequence.
-      /**
-       * A pointer to the @c CORBA::TypeCode_ptr rather than the
-       * @c CORBA::TypeCode_ptr itself is stored since that address is
-       * well-defined.  We may not know the value of the @c
-       * CORBA::TypeCode_ptr when creating this @c Field statically at
-       * compile-time, hence the indirection.
-       *
-       * @note This @c TypeCode is released upon destruction of this
-       *       @c TypeCode::Sequence.
-       */
-      CORBA::TypeCode_ptr const * const content_type_;
-
-      /// Length of the @c sequence or array.  A length of zero
-      /// indicates an unbounded @c sequence.
-      CORBA::ULong const length_;
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/Sequence_TypeCode_Static.inl"
-#endif  /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_SEQUENCE_TYPECODE_STATIC_H */
diff --git a/TAO/tao/Sequence_TypeCode_Static.inl b/TAO/tao/Sequence_TypeCode_Static.inl
deleted file mode 100644
index 27e98729656..00000000000
--- a/TAO/tao/Sequence_TypeCode_Static.inl
+++ /dev/null
@@ -1,16 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-ACE_INLINE
-TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
-                        TAO::Null_RefCount_Policy>::Sequence (
-  CORBA::TCKind kind,
-  CORBA::TypeCode_ptr const * content_type,
-  CORBA::ULong length)
-  : CORBA::TypeCode (kind)
-  , ACE_NESTED_CLASS (TAO, Null_RefCount_Policy) ()
-  , content_type_ (content_type)
-  , length_ (length)
-{
-}
diff --git a/TAO/tao/ServerRequestInterceptor_Adapter.h b/TAO/tao/ServerRequestInterceptor_Adapter.h
index 3b065394909..02b5b9657d7 100644
--- a/TAO/tao/ServerRequestInterceptor_Adapter.h
+++ b/TAO/tao/ServerRequestInterceptor_Adapter.h
@@ -41,6 +41,9 @@ namespace TAO
 {
   class ServerRequestInfo;
   class Argument;
+  class PICurrent_Impl;
+  class PICurrent_Copy_Callback;
+  class Upcall_Command;
 
   /**
    * @class ServerRequestInterceptor_Adapter
@@ -139,7 +142,23 @@ namespace TAO
       ACE_ENV_ARG_DECL) = 0;
 
     virtual void destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL) = 0;
-  };
+
+    virtual TAO::PICurrent_Impl *allocate_pi_current (void) = 0;
+
+    virtual TAO::PICurrent_Copy_Callback *
+        allocate_pi_current_callback (void) = 0;
+
+    virtual void deallocate_pi_current (
+        TAO::PICurrent_Impl *picurrent) = 0;
+
+    virtual void deallocate_pi_current_callback (
+        TAO::PICurrent_Copy_Callback *callback) = 0;
+
+    virtual void execute_command (
+        TAO_ServerRequest &server_request,
+        TAO::Upcall_Command &command
+        ACE_ENV_ARG_DECL) = 0;
+};
 
 }
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Services.pidl b/TAO/tao/Services.pidl
index dece1ce7bbb..c855d525ca0 100644
--- a/TAO/tao/Services.pidl
+++ b/TAO/tao/Services.pidl
@@ -22,7 +22,7 @@
 #ifndef TAO_CORBA_SERVICES_IDL
 #define TAO_CORBA_SERVICES_IDL
 
-#include "OctetSeq.pidl"
+#include "tao/OctetSeq.pidl"
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/ServicesA.cpp b/TAO/tao/ServicesA.cpp
deleted file mode 100644
index 19e890423f4..00000000000
--- a/TAO/tao/ServicesA.cpp
+++ /dev/null
@@ -1,519 +0,0 @@
-// -*- 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/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "ServicesC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/Recursive_Type_TypeCode.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ServiceType (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ServiceType:1.0",
-    "ServiceType",
-    &CORBA::_tc_ushort);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ServiceType =
-    &_tao_tc_CORBA_ServiceType;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ServiceOption (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ServiceOption:1.0",
-    "ServiceOption",
-    &CORBA::_tc_ulong);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ServiceOption =
-    &_tao_tc_CORBA_ServiceOption;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ServiceDetailType (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ServiceDetailType:1.0",
-    "ServiceDetailType",
-    &CORBA::_tc_ulong);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ServiceDetailType =
-    &_tao_tc_CORBA_ServiceDetailType;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ServiceDetailData (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ServiceDetailData:1.0",
-    "ServiceDetailData",
-    &CORBA::_tc_OctetSeq);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ServiceDetailData =
-    &_tao_tc_CORBA_ServiceDetailData;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_CORBA_ServiceOptionSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ServiceOptionSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ServiceOptionSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_ServiceOption,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ServiceOptionSeq_0 =
-      &CORBA_ServiceOptionSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ServiceOptionSeq_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ServiceOptionSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ServiceOptionSeq:1.0",
-    "ServiceOptionSeq",
-    &TAO::TypeCode::tc_CORBA_ServiceOptionSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ServiceOptionSeq =
-    &_tao_tc_CORBA_ServiceOptionSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ServiceDetail[] =
-  {
-    { "service_detail_type", &CORBA::_tc_ServiceDetailType },
-    { "service_detail", &CORBA::_tc_ServiceDetailData }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ServiceDetail (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/ServiceDetail:1.0",
-    "ServiceDetail",
-    _tao_fields_CORBA_ServiceDetail,
-    2);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ServiceDetail =
-    &_tao_tc_CORBA_ServiceDetail;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_CORBA_ServiceDetailSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ServiceDetailSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ServiceDetailSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_ServiceDetail,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ServiceDetailSeq_0 =
-      &CORBA_ServiceDetailSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ServiceDetailSeq_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ServiceDetailSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ServiceDetailSeq:1.0",
-    "ServiceDetailSeq",
-    &TAO::TypeCode::tc_CORBA_ServiceDetailSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ServiceDetailSeq =
-    &_tao_tc_CORBA_ServiceDetailSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ServiceInformation[] =
-  {
-    { "service_options", &CORBA::_tc_ServiceOptionSeq },
-    { "service_details", &CORBA::_tc_ServiceDetailSeq }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ServiceInformation (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/ServiceInformation:1.0",
-    "ServiceInformation",
-    _tao_fields_CORBA_ServiceInformation,
-    2);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ServiceInformation =
-    &_tao_tc_CORBA_ServiceInformation;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ServiceOptionSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ServiceOptionSeq>::insert_copy (
-      _tao_any,
-      CORBA::ServiceOptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ServiceOptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ServiceOptionSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ServiceOptionSeq>::insert (
-      _tao_any,
-      CORBA::ServiceOptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ServiceOptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ServiceOptionSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ServiceOptionSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ServiceOptionSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ServiceOptionSeq>::extract (
-        _tao_any,
-        CORBA::ServiceOptionSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ServiceOptionSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// 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 >>= 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
-      );
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ServiceDetailSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ServiceDetailSeq>::insert_copy (
-      _tao_any,
-      CORBA::ServiceDetailSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ServiceDetailSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ServiceDetailSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ServiceDetailSeq>::insert (
-      _tao_any,
-      CORBA::ServiceDetailSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ServiceDetailSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ServiceDetailSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ServiceDetailSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ServiceDetailSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ServiceDetailSeq>::extract (
-        _tao_any,
-        CORBA::ServiceDetailSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ServiceDetailSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// 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 >>= 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
-      );
-}
diff --git a/TAO/tao/ServicesC.cpp b/TAO/tao/ServicesC.cpp
index 839958233b4..765d9c8e576 100644
--- a/TAO/tao/ServicesC.cpp
+++ b/TAO/tao/ServicesC.cpp
@@ -26,17 +26,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:288
 
 
 #include "ServicesC.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__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
@@ -59,7 +55,7 @@ CORBA::ServiceOptionSeq::ServiceOptionSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ServiceOption
+        ServiceOption
       >
     (max)
 {}
@@ -71,7 +67,7 @@ CORBA::ServiceOptionSeq::ServiceOptionSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ServiceOption
+        ServiceOption
       >
     (max, length, buffer, release)
 {}
@@ -80,7 +76,7 @@ CORBA::ServiceOptionSeq::ServiceOptionSeq (
     const ServiceOptionSeq &seq
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ServiceOption
+        ServiceOption
       >
     (seq)
 {}
@@ -125,7 +121,7 @@ CORBA::ServiceDetailSeq::ServiceDetailSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ServiceDetail
+        ServiceDetail
       >
     (max)
 {}
@@ -137,7 +133,7 @@ CORBA::ServiceDetailSeq::ServiceDetailSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ServiceDetail
+        ServiceDetail
       >
     (max, length, buffer, release)
 {}
@@ -146,7 +142,7 @@ CORBA::ServiceDetailSeq::ServiceDetailSeq (
     const ServiceDetailSeq &seq
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ServiceDetail
+        ServiceDetail
       >
     (seq)
 {}
diff --git a/TAO/tao/ServicesC.h b/TAO/tao/ServicesC.h
index 1df591e569d..5e24beb739a 100644
--- a/TAO/tao/ServicesC.h
+++ b/TAO/tao/ServicesC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_SERVICESC_H_
-#define _TAO_IDL_ORIG_SERVICESC_H_
+#ifndef _TAO_IDL_SERVICESC_H_
+#define _TAO_IDL_SERVICESC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -60,12 +60,8 @@
 #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
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace CORBA
 {
@@ -77,33 +73,18 @@ namespace CORBA
   typedef CORBA::UShort_out ServiceType_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ServiceType;
-  
-  // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:379
   
   typedef CORBA::ULong ServiceOption;
   typedef CORBA::ULong_out ServiceOption_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ServiceOption;
-  
-  // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:379
   
   typedef CORBA::ULong ServiceDetailType;
   typedef CORBA::ULong_out ServiceDetailType_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ServiceDetailType;
-  
-  // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:472
   
   typedef OctetSeq ServiceDetailData;
@@ -111,11 +92,6 @@ namespace CORBA
   typedef OctetSeq_out ServiceDetailData_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ServiceDetailData;
-  
-  // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_SERVICEOPTIONSEQ_CH_)
@@ -164,11 +140,6 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ServiceOptionSeq;
-  
-  // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
   
   const CORBA::ServiceType Security = 1U;
@@ -192,7 +163,7 @@ namespace CORBA
     ServiceDetail_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
+  // be\be_visitor_structure/structure_ch.cpp:57
   
   struct TAO_Export ServiceDetail
   {
@@ -204,11 +175,6 @@ namespace CORBA
   };
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ServiceDetail;
-  
-  // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_SERVICEDETAILSEQ_CH_)
@@ -257,11 +223,6 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ServiceDetailSeq;
-  
-  // TAO_IDL - Generated from
   // be\be_type.cpp:258
   
   struct ServiceInformation;
@@ -280,7 +241,7 @@ namespace CORBA
     ServiceInformation_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
+  // be\be_visitor_structure/structure_ch.cpp:57
   
   struct TAO_Export ServiceInformation
   {
@@ -290,14 +251,9 @@ namespace CORBA
     CORBA::ServiceOptionSeq service_options;
     CORBA::ServiceDetailSeq service_details;
   };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ServiceInformation;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module CORBA
 
@@ -310,38 +266,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::ServiceOptionSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::ServiceOptionSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ServiceOptionSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ServiceOptionSeq *&);
-
-// TAO_IDL - Generated from
-// 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
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::ServiceDetailSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::ServiceDetailSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ServiceDetailSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ServiceDetailSeq *&);
-
-// TAO_IDL - Generated from
-// 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
 // be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_CORBA_ServiceOptionSeq_H_
@@ -388,16 +312,12 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ServiceInfor
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ServiceInformation &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
+// be\be_codegen.cpp:1062
 
 #if defined(_MSC_VER)
 #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/ShortSeqA.cpp b/TAO/tao/ShortSeqA.cpp
deleted file mode 100644
index 82cd3336f0f..00000000000
--- a/TAO/tao/ShortSeqA.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-// -*- 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/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "ShortSeqC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_CORBA_ShortSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ShortSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ShortSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_short,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ShortSeq_0 =
-      &CORBA_ShortSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ShortSeq_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ShortSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ShortSeq:1.0",
-    "ShortSeq",
-    &TAO::TypeCode::tc_CORBA_ShortSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ShortSeq =
-    &_tao_tc_CORBA_ShortSeq;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ShortSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ShortSeq>::insert_copy (
-      _tao_any,
-      CORBA::ShortSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ShortSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ShortSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ShortSeq>::insert (
-      _tao_any,
-      CORBA::ShortSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ShortSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ShortSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ShortSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ShortSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ShortSeq>::extract (
-        _tao_any,
-        CORBA::ShortSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ShortSeq_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/ShortSeqC.cpp b/TAO/tao/ShortSeqC.cpp
index ef3a5aeb545..5b4df566b26 100644
--- a/TAO/tao/ShortSeqC.cpp
+++ b/TAO/tao/ShortSeqC.cpp
@@ -26,16 +26,12 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
 #include "ShortSeqC.h"
 #include "tao/CDR.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
diff --git a/TAO/tao/ShortSeqC.h b/TAO/tao/ShortSeqC.h
index 08034a23bc8..79b6809bd5a 100644
--- a/TAO/tao/ShortSeqC.h
+++ b/TAO/tao/ShortSeqC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_SHORTSEQC_H_
-#define _TAO_IDL_ORIG_SHORTSEQC_H_
+#ifndef _TAO_IDL_SHORTSEQC_H_
+#define _TAO_IDL_SHORTSEQC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -52,17 +52,8 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#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
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace CORBA
 {
@@ -114,14 +105,9 @@ namespace CORBA
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ShortSeq;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module CORBA
 
@@ -134,14 +120,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::ShortSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::ShortSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ShortSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ShortSeq *&);
-
-// TAO_IDL - Generated from
 // be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_CORBA_ShortSeq_H_
@@ -159,15 +137,7 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_ShortSeq_H_ */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+// be\be_codegen.cpp:1028
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/Special_Basic_Argument_T.cpp b/TAO/tao/Special_Basic_Argument_T.cpp
index 3fe67efa366..ee973ea75ec 100644
--- a/TAO/tao/Special_Basic_Argument_T.cpp
+++ b/TAO/tao/Special_Basic_Argument_T.cpp
@@ -4,7 +4,6 @@
 #define TAO_SPECIAL_BASIC_ARGUMENT_T_C
 
 #include "tao/Special_Basic_Argument_T.h"
-#include "tao/Dynamic_ParameterC.h"
 
 #if !defined (__ACE_INLINE__)
 #include "tao/Special_Basic_Argument_T.inl"
@@ -14,41 +13,38 @@ ACE_RCSID (tao,
            Special_Basic_Argument_T,
            "$Id$")
 
-template<typename S, typename to_S, typename from_S>
+template<typename S, typename to_S, typename from_S, typename Insert_Policy>
 CORBA::Boolean
-TAO::In_Special_Basic_Argument_T<S,to_S,from_S>::marshal (TAO_OutputCDR & cdr)
+TAO::In_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << from_S (this->x_);
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, typename to_S, typename from_S>
+template<typename S, typename to_S, typename from_S, typename Insert_Policy>
 void
-TAO::In_Special_Basic_Argument_T<S,to_S,from_S>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::In_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  p.argument <<= from_S (this->x_);
-  p.mode = CORBA::PARAM_IN;
+  this->Insert_Policy::any_insert (any, from_S (this->x_));
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ===========================================================
 
-template<typename S, typename to_S, typename from_S>
+template<typename S, typename to_S, typename from_S, typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_Special_Basic_Argument_T<S,to_S,from_S>::marshal (
-    TAO_OutputCDR & cdr
-  )
+TAO::Inout_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::marshal (
+    TAO_OutputCDR & cdr)
 {
   return cdr << from_S (this->x_);
 }
 
-template<typename S, typename to_S, typename from_S>
+template<typename S, typename to_S, typename from_S, typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_Special_Basic_Argument_T<S,to_S,from_S>::demarshal (
+TAO::Inout_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::demarshal (
     TAO_InputCDR & cdr
   )
 {
@@ -57,23 +53,21 @@ TAO::Inout_Special_Basic_Argument_T<S,to_S,from_S>::demarshal (
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, typename to_S, typename from_S>
+template<typename S, typename to_S, typename from_S, typename Insert_Policy>
 void
-TAO::Inout_Special_Basic_Argument_T<S,to_S,from_S>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::Inout_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  p.argument <<= from_S (this->x_);
-  p.mode = CORBA::PARAM_INOUT;
+  this->Insert_Policy::any_insert (any, from_S (this->x_));
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ==============================================================
 
-template<typename S, typename to_S, typename from_S>
+template<typename S, typename to_S, typename from_S, typename Insert_Policy>
 CORBA::Boolean
-TAO::Out_Special_Basic_Argument_T<S,to_S,from_S>::demarshal (
+TAO::Out_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::demarshal (
     TAO_InputCDR & cdr
   )
 {
@@ -82,23 +76,21 @@ TAO::Out_Special_Basic_Argument_T<S,to_S,from_S>::demarshal (
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, typename to_S, typename from_S>
+template<typename S, typename to_S, typename from_S, typename Insert_Policy>
 void
-TAO::Out_Special_Basic_Argument_T<S,to_S,from_S>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::Out_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  p.argument <<= from_S (this->x_);
-  p.mode = CORBA::PARAM_OUT;
+  this->Insert_Policy::any_insert (any, from_S (this->x_));
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ============================================================
 
-template<typename S, typename to_S, typename from_S>
+template<typename S, typename to_S, typename from_S, typename Insert_Policy>
 CORBA::Boolean
-TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S>::demarshal (
+TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::demarshal (
     TAO_InputCDR & cdr
   )
 {
@@ -107,13 +99,12 @@ TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S>::demarshal (
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, typename to_S, typename from_S>
+template<typename S, typename to_S, typename from_S, typename Insert_Policy>
 void
-TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S>::interceptor_result (
-    CORBA::Any * any
-  )
+TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  (*any) <<= from_S (this->x_);
+  this->Insert_Policy::any_insert (any, from_S (this->x_));
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
diff --git a/TAO/tao/Special_Basic_Argument_T.h b/TAO/tao/Special_Basic_Argument_T.h
index 456e5d9a9d8..e113596d8a3 100644
--- a/TAO/tao/Special_Basic_Argument_T.h
+++ b/TAO/tao/Special_Basic_Argument_T.h
@@ -31,15 +31,15 @@ namespace TAO
    * @brief Template class for IN stub argument of (w)char/boolean/octet.
    *
    */
-  template<typename S, typename to_S, typename from_S>
-  class In_Special_Basic_Argument_T : public Argument
+  template<typename S, typename to_S, typename from_S, typename Insert_Policy>
+  class In_Special_Basic_Argument_T : public InArgument, private Insert_Policy
   {
   public:
     In_Special_Basic_Argument_T (S const &);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S const & arg (void) const;
 
@@ -53,16 +53,16 @@ namespace TAO
    * @brief Template class for INOUT stub argument of (w)char/boolean/octet.
    *
    */
-  template<typename S, typename to_S, typename from_S>
-  class Inout_Special_Basic_Argument_T : public Argument
+  template<typename S, typename to_S, typename from_S, typename Insert_Policy>
+  class Inout_Special_Basic_Argument_T : public InoutArgument, private Insert_Policy
   {
   public:
     Inout_Special_Basic_Argument_T (S & x);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S & arg (void);
 
@@ -76,15 +76,15 @@ namespace TAO
    * @brief Template class for OUT stub argument of (w)char/boolean/octet.
    *
    */
-  template<typename S, typename to_S, typename from_S>
-  class Out_Special_Basic_Argument_T : public Argument
+  template<typename S, typename to_S, typename from_S, typename Insert_Policy>
+  class Out_Special_Basic_Argument_T : public OutArgument, private Insert_Policy
   {
   public:
     Out_Special_Basic_Argument_T (S & x);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S & arg (void);
 
@@ -98,15 +98,15 @@ namespace TAO
    * @brief Template class for return stub value of (w)char/boolean/octet.
    *
    */
-  template<typename S, typename to_S, typename from_S>
-  class Ret_Special_Basic_Argument_T : public Argument
+  template<typename S, typename to_S, typename from_S, typename Insert_Policy>
+  class Ret_Special_Basic_Argument_T : public RetArgument, private Insert_Policy
   {
   public:
     Ret_Special_Basic_Argument_T (void);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_result (CORBA::Any *);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S & arg (void);
 
@@ -126,12 +126,12 @@ namespace TAO
   struct TAO_Export Special_Basic_Tag {};
 
   /**
-   * @struct Special_Basic_Traits_T
+   * @struct Special_Basic_Arg_Traits_T
    *
    * @brief Template class for stub argument traits of (w)char/boolean/octet.
    *
    */
-  template<typename T, typename to_T, typename from_T>
+  template<typename T, typename to_T, typename from_T, typename Insert_Policy>
   struct Special_Basic_Arg_Traits_T
   {
     typedef T                                               ret_type;
@@ -139,10 +139,10 @@ namespace TAO
     typedef T &                                             inout_type;
     typedef T &                                             out_type;
 
-    typedef In_Special_Basic_Argument_T<T,to_T,from_T>      in_arg_val;
-    typedef Inout_Special_Basic_Argument_T<T,to_T,from_T>   inout_arg_val;
-    typedef Out_Special_Basic_Argument_T<T,to_T,from_T>     out_arg_val;
-    typedef Ret_Special_Basic_Argument_T<T,to_T,from_T>     ret_val;
+    typedef In_Special_Basic_Argument_T<T,to_T,from_T,Insert_Policy>      in_arg_val;
+    typedef Inout_Special_Basic_Argument_T<T,to_T,from_T,Insert_Policy>   inout_arg_val;
+    typedef Out_Special_Basic_Argument_T<T,to_T,from_T,Insert_Policy>     out_arg_val;
+    typedef Ret_Special_Basic_Argument_T<T,to_T,from_T,Insert_Policy>     ret_val;
 
     typedef Special_Basic_Tag                               idl_tag;
   };
diff --git a/TAO/tao/Special_Basic_Argument_T.inl b/TAO/tao/Special_Basic_Argument_T.inl
index 66887ab09a3..850c2209cbb 100644
--- a/TAO/tao/Special_Basic_Argument_T.inl
+++ b/TAO/tao/Special_Basic_Argument_T.inl
@@ -2,85 +2,85 @@
 //
 // $Id$
 
-template<typename S, typename to_S, typename from_S>
+template<typename S, typename to_S, typename from_S, typename Insert_Policy>
 ACE_INLINE
-TAO::In_Special_Basic_Argument_T<S,to_S,from_S>::In_Special_Basic_Argument_T (
+TAO::In_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::In_Special_Basic_Argument_T (
      S const & x
   )
   : x_ (x)
 {}
 
-template<typename S, typename to_S, typename from_S>
+template<typename S, typename to_S, typename from_S, typename Insert_Policy>
 ACE_INLINE
 S const &
-TAO::In_Special_Basic_Argument_T<S,to_S,from_S>::arg (void) const
+TAO::In_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::arg (void) const
 {
   return this->x_;
 }
 
 // ===========================================================================
 
-template<typename S, typename to_S, typename from_S>
+template<typename S, typename to_S, typename from_S, typename Insert_Policy>
 ACE_INLINE
-TAO::Inout_Special_Basic_Argument_T<S,to_S,from_S>::
+TAO::Inout_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::
 Inout_Special_Basic_Argument_T (S & x)
   : x_ (x)
 {}
 
-template<typename S, typename to_S, typename from_S>
+template<typename S, typename to_S, typename from_S, typename Insert_Policy>
 ACE_INLINE
 S &
-TAO::Inout_Special_Basic_Argument_T<S,to_S,from_S>::arg (void)
+TAO::Inout_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::arg (void)
 {
   return this->x_;
 }
 
 // ===========================================================================
 
-template<typename S, typename to_S, typename from_S>
+template<typename S, typename to_S, typename from_S, typename Insert_Policy>
 ACE_INLINE
-TAO::Out_Special_Basic_Argument_T<S,to_S,from_S>::
+TAO::Out_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::
 Out_Special_Basic_Argument_T (S & x)
   : x_ (x)
 {}
 
-template<typename S, typename to_S, typename from_S>
+template<typename S, typename to_S, typename from_S, typename Insert_Policy>
 ACE_INLINE
 S &
-TAO::Out_Special_Basic_Argument_T<S,to_S,from_S>::arg (void)
+TAO::Out_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::arg (void)
 {
   return this->x_;
 }
 
 // ===========================================================================
 
-template<typename S, typename to_S, typename from_S>
+template<typename S, typename to_S, typename from_S, typename Insert_Policy>
 ACE_INLINE
-TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S>::
+TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::
 Ret_Special_Basic_Argument_T (void)
 {
 }
 
-template<typename S, typename to_S, typename from_S>
+template<typename S, typename to_S, typename from_S, typename Insert_Policy>
 ACE_INLINE
 S &
-TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S>::arg (void)
+TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::arg (void)
 {
   return this->x_;
 }
 
-template<typename S, typename to_S, typename from_S>
+template<typename S, typename to_S, typename from_S, typename Insert_Policy>
 ACE_INLINE
 S
-TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S>::excp (void)
+TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::excp (void)
 {
   return this->x_;
 }
 
-template<typename S, typename to_S, typename from_S>
+template<typename S, typename to_S, typename from_S, typename Insert_Policy>
 ACE_INLINE
 S
-TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S>::retn (void)
+TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::retn (void)
 {
   return this->x_;
 }
diff --git a/TAO/tao/Special_Basic_Arguments.h b/TAO/tao/Special_Basic_Arguments.h
index 487354abb36..49e8e16e9e6 100644
--- a/TAO/tao/Special_Basic_Arguments.h
+++ b/TAO/tao/Special_Basic_Arguments.h
@@ -15,6 +15,7 @@
 #define TAO_SPECIAL_BASIC_ARGUMENTS_H
 
 #include /**/ "ace/pre.h"
+
 #include "ace/CDR_Stream.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -36,7 +37,8 @@ namespace TAO
   class TAO_Export Arg_Traits<ACE_InputCDR::to_char>
     : public Special_Basic_Arg_Traits_T<CORBA::Char,
                                         ACE_InputCDR::to_char,
-                                        ACE_OutputCDR::from_char>
+                                        ACE_OutputCDR::from_char,
+                                        TAO::Any_Insert_Policy_AnyTypeCode_Adapter <ACE_OutputCDR::from_char> >
   {
   };
 
@@ -44,7 +46,8 @@ namespace TAO
   class TAO_Export Arg_Traits<ACE_InputCDR::to_wchar>
     : public Special_Basic_Arg_Traits_T<CORBA::WChar,
                                         ACE_InputCDR::to_wchar,
-                                        ACE_OutputCDR::from_wchar>
+                                        ACE_OutputCDR::from_wchar,
+                                        TAO::Any_Insert_Policy_AnyTypeCode_Adapter <ACE_OutputCDR::from_wchar> >
   {
   };
 
@@ -52,7 +55,8 @@ namespace TAO
   class TAO_Export Arg_Traits<ACE_InputCDR::to_octet>
     : public Special_Basic_Arg_Traits_T<CORBA::Octet,
                                         ACE_InputCDR::to_octet,
-                                        ACE_OutputCDR::from_octet>
+                                        ACE_OutputCDR::from_octet,
+                                        TAO::Any_Insert_Policy_AnyTypeCode_Adapter <ACE_OutputCDR::from_octet> >
   {
   };
 
@@ -60,7 +64,8 @@ namespace TAO
   class TAO_Export Arg_Traits<ACE_InputCDR::to_boolean>
     : public Special_Basic_Arg_Traits_T<CORBA::Boolean,
                                         ACE_InputCDR::to_boolean,
-                                        ACE_OutputCDR::from_boolean>
+                                        ACE_OutputCDR::from_boolean,
+                                        TAO::Any_Insert_Policy_AnyTypeCode_Adapter <ACE_OutputCDR::from_boolean> >
   {
   };
 }
diff --git a/TAO/tao/Strategies.mpc b/TAO/tao/Strategies.mpc
index d4ae5aa3c54..4e30d8c78ab 100644
--- a/TAO/tao/Strategies.mpc
+++ b/TAO/tao/Strategies.mpc
@@ -1,6 +1,6 @@
 //$Id$
 
-project : taolib, core {
+project : taolib, core, anytypecode {
   sharedname   = TAO_Strategies
   dynamicflags = TAO_STRATEGIES_BUILD_DLL
 
@@ -28,6 +28,9 @@ project : taolib, core {
     Strategies
   }
 
+  IDL_Files {
+  }
+
   Pkgconfig_Files {
     Strategies/TAO_Strategies.pc.in
   }
diff --git a/TAO/tao/Strategies/sciop_endpointsC.cpp b/TAO/tao/Strategies/sciop_endpointsC.cpp
index b88f306beae..1624ec7940a 100644
--- a/TAO/tao/Strategies/sciop_endpointsC.cpp
+++ b/TAO/tao/Strategies/sciop_endpointsC.cpp
@@ -31,13 +31,13 @@
 
 #include "sciop_endpointsC.h"
 #include "tao/CDR.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Sequence_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -60,7 +60,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
     { "host", &CORBA::_tc_string },
     { "port", &CORBA::_tc_short },
     { "priority", &CORBA::_tc_short }
-    
+
   };
 static TAO::TypeCode::Struct<char const *,
                              CORBA::TypeCode_ptr const *,
@@ -73,16 +73,16 @@ static TAO::TypeCode::Struct<char const *,
     "TAO_SCIOP_Endpoint_Info",
     _tao_fields_TAO_SCIOP_Endpoint_Info,
     3);
-  
+
 ::CORBA::TypeCode_ptr const _tc_TAO_SCIOP_Endpoint_Info =
   &_tao_tc_TAO_SCIOP_Endpoint_Info;
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be/be_visitor_structure/structure_cs.cpp:66
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be/be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_TAO_SCIOPENDPOINTSEQUENCE_CS_)
@@ -147,10 +147,10 @@ namespace TAO
         CORBA::tk_sequence,
         &_tc_TAO_SCIOP_Endpoint_Info,
         0U);
-      
+
     ::CORBA::TypeCode_ptr const tc_TAO_SCIOPEndpointSequence_0 =
       &TAO_SCIOPEndpointSequence_0;
-    
+
   }
 }
 
@@ -164,7 +164,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:TAO_SCIOPEndpointSequence:1.0",
     "TAO_SCIOPEndpointSequence",
     &TAO::TypeCode::tc_TAO_SCIOPEndpointSequence_0);
-  
+
 ::CORBA::TypeCode_ptr const _tc_TAO_SCIOPEndpointSequence =
   &_tao_tc_TAO_SCIOPEndpointSequence;
 
@@ -205,20 +205,20 @@ CORBA::Boolean operator<< (
   )
 {
   const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = true;
-      
+
       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 false;
 }
 
@@ -228,7 +228,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -238,28 +238,28 @@ CORBA::Boolean operator>> (
         {
           return false;
         }
-      
+
       // 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 true;
         }
-      
+
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = true;
-      
+
       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 false;
 }
 
diff --git a/TAO/tao/Strategies/uiop_endpointsC.cpp b/TAO/tao/Strategies/uiop_endpointsC.cpp
index 47b181cab77..293514fbdec 100644
--- a/TAO/tao/Strategies/uiop_endpointsC.cpp
+++ b/TAO/tao/Strategies/uiop_endpointsC.cpp
@@ -31,13 +31,13 @@
 
 #include "uiop_endpointsC.h"
 #include "tao/CDR.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Sequence_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -59,7 +59,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
   {
     { "rendezvous_point", &CORBA::_tc_string },
     { "priority", &CORBA::_tc_short }
-    
+
   };
 static TAO::TypeCode::Struct<char const *,
                              CORBA::TypeCode_ptr const *,
@@ -72,16 +72,16 @@ static TAO::TypeCode::Struct<char const *,
     "TAO_UIOP_Endpoint_Info",
     _tao_fields_TAO_UIOP_Endpoint_Info,
     2);
-  
+
 ::CORBA::TypeCode_ptr const _tc_TAO_UIOP_Endpoint_Info =
   &_tao_tc_TAO_UIOP_Endpoint_Info;
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be/be_visitor_structure/structure_cs.cpp:66
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be/be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_TAO_UIOPENDPOINTSEQUENCE_CS_)
@@ -146,10 +146,10 @@ namespace TAO
         CORBA::tk_sequence,
         &_tc_TAO_UIOP_Endpoint_Info,
         0U);
-      
+
     ::CORBA::TypeCode_ptr const tc_TAO_UIOPEndpointSequence_0 =
       &TAO_UIOPEndpointSequence_0;
-    
+
   }
 }
 
@@ -163,7 +163,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:TAO_UIOPEndpointSequence:1.0",
     "TAO_UIOPEndpointSequence",
     &TAO::TypeCode::tc_TAO_UIOPEndpointSequence_0);
-  
+
 ::CORBA::TypeCode_ptr const _tc_TAO_UIOPEndpointSequence =
   &_tao_tc_TAO_UIOPEndpointSequence;
 
@@ -202,20 +202,20 @@ CORBA::Boolean operator<< (
   )
 {
   const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = true;
-      
+
       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 false;
 }
 
@@ -225,7 +225,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -235,28 +235,28 @@ CORBA::Boolean operator>> (
         {
           return false;
         }
-      
+
       // 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 true;
         }
-      
+
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = true;
-      
+
       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 false;
 }
 
diff --git a/TAO/tao/StringSeqA.cpp b/TAO/tao/StringSeqA.cpp
deleted file mode 100644
index 625c670659c..00000000000
--- a/TAO/tao/StringSeqA.cpp
+++ /dev/null
@@ -1,143 +0,0 @@
-// -*- 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/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "StringSeqC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_CORBA_StringSeq_GUARD
-#define _TAO_TYPECODE_CORBA_StringSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_StringSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_string,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_StringSeq_0 =
-      &CORBA_StringSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_StringSeq_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_StringSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/StringSeq:1.0",
-    "StringSeq",
-    &TAO::TypeCode::tc_CORBA_StringSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_StringSeq =
-    &_tao_tc_CORBA_StringSeq;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::StringSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::StringSeq>::insert_copy (
-      _tao_any,
-      CORBA::StringSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_StringSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::StringSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::StringSeq>::insert (
-      _tao_any,
-      CORBA::StringSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_StringSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::StringSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::StringSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::StringSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::StringSeq>::extract (
-        _tao_any,
-        CORBA::StringSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_StringSeq_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/StringSeqC.cpp b/TAO/tao/StringSeqC.cpp
index 4ee23832b66..5e3db1770bc 100644
--- a/TAO/tao/StringSeqC.cpp
+++ b/TAO/tao/StringSeqC.cpp
@@ -26,16 +26,12 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
 #include "StringSeqC.h"
 #include "tao/CDR.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
diff --git a/TAO/tao/StringSeqC.h b/TAO/tao/StringSeqC.h
index e039c5b516c..9cfebe0ca70 100644
--- a/TAO/tao/StringSeqC.h
+++ b/TAO/tao/StringSeqC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_STRINGSEQC_H_
-#define _TAO_IDL_ORIG_STRINGSEQC_H_
+#ifndef _TAO_IDL_STRINGSEQC_H_
+#define _TAO_IDL_STRINGSEQC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -52,17 +52,8 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#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
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace CORBA
 {
@@ -112,14 +103,9 @@ namespace CORBA
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_StringSeq;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module CORBA
 
@@ -132,14 +118,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::StringSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::StringSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::StringSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::StringSeq *&);
-
-// TAO_IDL - Generated from
 // be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_CORBA_StringSeq_H_
@@ -157,15 +135,7 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_StringSeq_H_ */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+// be\be_codegen.cpp:1028
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/String_TypeCode.cpp b/TAO/tao/String_TypeCode.cpp
deleted file mode 100644
index ecf53573cfd..00000000000
--- a/TAO/tao/String_TypeCode.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-// $Id$
-
-#ifndef TAO_STRING_TYPECODE_CPP
-#define TAO_STRING_TYPECODE_CPP
-
-#include "tao/String_TypeCode.h"
-#include "tao/CDR.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/String_TypeCode.inl"
-#endif  /* !__ACE_INLINE__ */
-
-
-template <class RefCountPolicy>
-bool
-TAO::TypeCode::String<RefCountPolicy>::tao_marshal (TAO_OutputCDR & cdr,
-                                                    CORBA::ULong) const
-{
-  // A tk_string TypeCode has a "simple" parameter list type (see
-  // Table 15-2 in Section 15.3.5.1 "TypeCode" in the CDR section of
-  // the CORBA specification), meaning that its parameter(s) must be
-  // marshaled immediately following the TCKind.  No CDR encapsulation
-  // is to be created.
-
-  return (cdr << this->length_);
-}
-
-template <class RefCountPolicy>
-void
-TAO::TypeCode::String<RefCountPolicy>::tao_duplicate (void)
-{
-  this->RefCountPolicy::add_ref ();
-}
-
-template <class RefCountPolicy>
-void
-TAO::TypeCode::String<RefCountPolicy>::tao_release (void)
-{
-  this->RefCountPolicy::remove_ref ();
-}
-
-template <class RefCountPolicy>
-CORBA::Boolean
-TAO::TypeCode::String<RefCountPolicy>::equal_i (CORBA::TypeCode_ptr tc
-                                                ACE_ENV_ARG_DECL) const
-{
-  // The following call won't throw since CORBA::TypeCode::equal() has
-  // already established the kind of tc is the same as our kind.
-  CORBA::ULong const tc_length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return (this->length_ == tc_length);
-}
-
-template <class RefCountPolicy>
-CORBA::Boolean
-TAO::TypeCode::String<RefCountPolicy>::equivalent_i (CORBA::TypeCode_ptr tc
-                                                     ACE_ENV_ARG_DECL) const
-{
-  // Since TCKind comparisons must be performed before equal_i() is
-  // called, we can also call it to determine equivalence of
-  // tk_string-based TypeCodes.
-  return this->equal_i (tc
-                        ACE_ENV_ARG_PARAMETER);
-}
-
-template <class RefCountPolicy>
-CORBA::TypeCode_ptr
-TAO::TypeCode::String<RefCountPolicy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Already compact since tk_string and tk_wstring TypeCodes have no
-  // name or member names, meaning that we can simply call
-  // _duplicate() on this TypeCode.
-
-  CORBA::TypeCode_ptr mutable_tc =
-    const_cast<TAO::TypeCode::String<RefCountPolicy> *> (this);
-
-  return CORBA::TypeCode::_duplicate (mutable_tc);
-}
-
-template <class RefCountPolicy>
-CORBA::ULong
-TAO::TypeCode::String<RefCountPolicy>::length_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->length_;
-}
-
-
-#endif  /* TAO_STRING_TYPECODE_CPP */
diff --git a/TAO/tao/String_TypeCode.h b/TAO/tao/String_TypeCode.h
deleted file mode 100644
index 5a3161c9a64..00000000000
--- a/TAO/tao/String_TypeCode.h
+++ /dev/null
@@ -1,111 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    String_TypeCode.h
- *
- *  $Id$
- *
- *  Header file for @c CORBA::tk_string or @c CORBA::tk_wstring
- *  @c CORBA::TypeCodes.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_STRING_TYPECODE_H
-#define TAO_STRING_TYPECODE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TypeCode.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-
-    /**
-     * @class String
-     *
-     * @brief @c CORBA::TypeCode implementation for OMG IDL string
-     *        types.
-     *
-     * This class implements a @c CORBA::TypeCode for OMG IDL string
-     * types, including @c wstring.
-     */
-    template <class RefCountPolicy>
-    class String
-      : public CORBA::TypeCode,
-        private RefCountPolicy
-    {
-    public:
-
-      /// Constructor.
-      String (CORBA::TCKind kind, CORBA::ULong length);
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
-      //@}
-
-    protected:
-
-      /**
-       * @name @c TAO CORBA::TypeCode Template Methods
-       *
-       * @c CORBA::TypeCode template methods specific to @c tk_string
-       * @c TypeCodes.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::ULong length_i (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    private:
-
-      /// Length of the @c string.  A length of zero indicates an
-      /// unbounded @c string.
-      CORBA::ULong const length_;
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/String_TypeCode.inl"
-#endif  /* __ACE_INLINE__ */
-
-#ifdef ACE_TEMPLATES_REQUIRE_SOURCE
-# include "tao/String_TypeCode.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
-# pragma implementation ("String_TypeCode.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_STRING_TYPECODE_H */
diff --git a/TAO/tao/String_TypeCode.inl b/TAO/tao/String_TypeCode.inl
deleted file mode 100644
index 90e8e887c3b..00000000000
--- a/TAO/tao/String_TypeCode.inl
+++ /dev/null
@@ -1,14 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-template <class RefCountPolicy>
-ACE_INLINE
-TAO::TypeCode::String<RefCountPolicy>::String (CORBA::TCKind kind,
-                                               CORBA::ULong length)
-  : CORBA::TypeCode (kind)
-  , RefCountPolicy ()
-  , length_ (length)
-{
-  // ACE_ASSERT (kind == CORBA::tk_string || kind == CORBA::tk_wstring);
-}
diff --git a/TAO/tao/String_TypeCode_Static.cpp b/TAO/tao/String_TypeCode_Static.cpp
deleted file mode 100644
index 2a5064570a7..00000000000
--- a/TAO/tao/String_TypeCode_Static.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-// $Id$
-
-#include "tao/String_TypeCode_Static.h"
-#include "tao/CDR.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/String_TypeCode_Static.inl"
-#endif  /* !__ACE_INLINE__ */
-
-
-ACE_RCSID (tao,
-           String_TypeCode_Static,
-           "$Id$")
-
-
-bool
-TAO::TypeCode::String<TAO::Null_RefCount_Policy>::tao_marshal (
-  TAO_OutputCDR & cdr,
-  CORBA::ULong) const
-{
-  // A tk_string TypeCode has a "simple" parameter list type (see
-  // Table 15-2 in Section 15.3.5.1 "TypeCode" in the CDR section of
-  // the CORBA specification), meaning that its parameter(s) must be
-  // marshaled immediately following the TCKind.  No CDR encapsulation
-  // is to be created.
-
-  return (cdr << this->length_);
-}
-
-void
-TAO::TypeCode::String<TAO::Null_RefCount_Policy>::tao_duplicate (void)
-{
-}
-
-void
-TAO::TypeCode::String<TAO::Null_RefCount_Policy>::tao_release (void)
-{
-}
-
-CORBA::Boolean
-TAO::TypeCode::String<TAO::Null_RefCount_Policy>::equal_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // The following call won't throw since CORBA::TypeCode::equal() has
-  // already established the kind of tc is the same as our kind.
-  CORBA::ULong const tc_length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return (this->length_ == tc_length);
-}
-
-CORBA::Boolean
-TAO::TypeCode::String<TAO::Null_RefCount_Policy>::equivalent_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // Since TCKind comparisons must be performed before equal_i() is
-  // called, we can also call it to determine equivalence of
-  // tk_string-based TypeCodes.
-  return this->equal_i (tc
-                        ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-TAO::TypeCode::String<TAO::Null_RefCount_Policy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Already compact since tk_string and tk_wstring TypeCodes have no
-  // name or member names, meaning that we can simply call
-  // _duplicate() on this TypeCode.
-
-  CORBA::TypeCode_ptr mutable_tc =
-    const_cast<TAO::TypeCode::String<TAO::Null_RefCount_Policy> *> (this);
-
-  return CORBA::TypeCode::_duplicate (mutable_tc);
-}
-
-CORBA::ULong
-TAO::TypeCode::String<TAO::Null_RefCount_Policy>::length_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->length_;
-}
diff --git a/TAO/tao/String_TypeCode_Static.h b/TAO/tao/String_TypeCode_Static.h
deleted file mode 100644
index 4ceedbdf135..00000000000
--- a/TAO/tao/String_TypeCode_Static.h
+++ /dev/null
@@ -1,107 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    String_TypeCode_Static.h
- *
- *  $Id$
- *
- *  Header file for static @c CORBA::tk_string or @c CORBA::tk_wstring
- *  @c CORBA::TypeCodes.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_STRING_TYPECODE_STATIC_H
-#define TAO_STRING_TYPECODE_STATIC_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TypeCode.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Null_RefCount_Policy.h"
-
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    template <class RefCountPolicy> class String;
-
-    /**
-     * @class String
-     *
-     * @brief @c CORBA::TypeCode implementation for OMG IDL string
-     *        types.
-     *
-     * This class implements a @c CORBA::TypeCode for OMG IDL string
-     * types, including @c wstring.
-     */
-    template<>
-    class TAO_Export String<TAO::Null_RefCount_Policy>
-      : public CORBA::TypeCode,
-        private TAO::Null_RefCount_Policy
-    {
-    public:
-
-      /// Constructor.
-      String (CORBA::TCKind kind, CORBA::ULong length);
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
-      //@}
-
-    protected:
-
-      /**
-       * @name @c TAO CORBA::TypeCode Template Methods
-       *
-       * @c CORBA::TypeCode template methods specific to @c tk_string
-       * @c TypeCodes.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::ULong length_i (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    private:
-
-      /// Length of the @c string.  A length of zero indicates an
-      /// unbounded @c string.
-      CORBA::ULong const length_;
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/String_TypeCode_Static.inl"
-#endif  /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_STRING_TYPECODE_STATIC_H */
diff --git a/TAO/tao/String_TypeCode_Static.inl b/TAO/tao/String_TypeCode_Static.inl
deleted file mode 100644
index 4d42413daa1..00000000000
--- a/TAO/tao/String_TypeCode_Static.inl
+++ /dev/null
@@ -1,14 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-ACE_INLINE
-TAO::TypeCode::String<TAO::Null_RefCount_Policy>::String (
-  CORBA::TCKind kind,
-  CORBA::ULong length)
-  : CORBA::TypeCode (kind)
-  , ACE_NESTED_CLASS (TAO, Null_RefCount_Policy) ()
-  , length_ (length)
-{
-  // ACE_ASSERT (kind == CORBA::tk_string || kind == CORBA::tk_wstring);
-}
diff --git a/TAO/tao/String_TypeCode_Traits.h b/TAO/tao/String_TypeCode_Traits.h
deleted file mode 100644
index fe287367100..00000000000
--- a/TAO/tao/String_TypeCode_Traits.h
+++ /dev/null
@@ -1,77 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    String_TypeCode_Traits.h
- *
- *  $Id$
- *
- *  Header file for bound
- *    @c tk_string,
- *    @c tk_wstring,
- *  @c CORBA::TypeCode factories.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_STRING_TYPECODE_TRAITS_H
-#define TAO_STRING_TYPECODE_TRAITS_H
-
-#include /**/ "ace/pre.h"
-
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/String_TypeCode.h"
-#include "tao/True_RefCount_Policy.h"
-
-namespace TAO
-{
-  namespace TypeCodeFactory
-  {
-    template <typename T> struct String_Traits;
-
-    template<>
-    struct String_Traits<CORBA::Any::from_string>
-    {
-      static CORBA::TypeCode_ptr create_typecode (CORBA::TCKind kind,
-                                                  CORBA::ULong bound)
-      {
-        typedef TAO::TypeCode::String<TAO::True_RefCount_Policy> typecode_type;
-
-        CORBA::TypeCode_ptr tc = CORBA::TypeCode::_nil ();
-        ACE_NEW_RETURN (tc,
-                        typecode_type (kind, bound),
-                        tc);
-
-        return tc;
-      }
-    };
-
-    template <>
-    struct String_Traits<CORBA::Any::from_wstring>
-    {
-      static CORBA::TypeCode_ptr create_typecode (CORBA::TCKind kind,
-                                                  CORBA::ULong bound)
-      {
-        typedef TAO::TypeCode::String<TAO::True_RefCount_Policy> typecode_type;
-
-        CORBA::TypeCode_ptr tc = CORBA::TypeCode::_nil ();
-        ACE_NEW_RETURN (tc,
-                        typecode_type (kind, bound),
-                        tc);
-
-        return tc;
-      }
-    };
-
-  }  // End namespace TypeCodeFactory
-}  // End namespace TAO
-
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_STRING_TYPECODE_TRAITS_H */
diff --git a/TAO/tao/Struct_TypeCode.cpp b/TAO/tao/Struct_TypeCode.cpp
deleted file mode 100644
index ccbdf3940a5..00000000000
--- a/TAO/tao/Struct_TypeCode.cpp
+++ /dev/null
@@ -1,346 +0,0 @@
-// $Id$
-
-#ifndef TAO_STRUCT_TYPECODE_CPP
-#define TAO_STRUCT_TYPECODE_CPP
-
-#include "tao/Struct_TypeCode.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/TypeCode_Traits.h"
-#include "tao/ORB_Core.h"
-#include "tao/TypeCodeFactory_Adapter.h"
-#include "tao/CDR.h"
-
-
-#ifndef __ACE_INLINE__
-# include "tao/Struct_TypeCode.inl"
-#endif  /* !__ACE_INLINE__ */
-
-#include "ace/Dynamic_Service.h"
-
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-bool
-TAO::TypeCode::Struct<StringType,
-                      TypeCodeType,
-                      FieldArrayType,
-                      RefCountPolicy>::tao_marshal (TAO_OutputCDR & cdr,
-                                                    CORBA::ULong offset) const
-{
-  // A tk_struct TypeCode has a "complex" parameter list type (see
-  // Table 15-2 in Section 15.3.5.1 "TypeCode" in the CDR section of
-  // the CORBA specification), meaning that it must be marshaled into
-  // a CDR encapsulation.
-
-  // Create a CDR encapsulation.
-  TAO_OutputCDR enc;
-
-  // Account for the encoded CDR encapsulation length and byte order.
-  //
-  // Aligning on an octet since the next value after the CDR
-  // encapsulation length will always be the byte order octet/boolean
-  // in this case.
-  offset = ACE_align_binary (offset + 4,
-                             ACE_CDR::OCTET_ALIGN);
-
-  bool const success =
-    (enc << TAO_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER))
-    && (enc << TAO_OutputCDR::from_string (this->base_attributes_.id (), 0))
-    && (enc << TAO_OutputCDR::from_string (this->base_attributes_.name (), 0))
-    && (enc << this->nfields_);
-
-  if (!success)
-    return false;
-
-  Struct_Field<StringType, TypeCodeType> const * const begin =
-    &this->fields_[0];
-  Struct_Field<StringType, TypeCodeType> const * const end =
-    begin + this->nfields_;
-
-  for (Struct_Field<StringType, TypeCodeType> const * i = begin; i != end; ++i)
-    {
-      Struct_Field<StringType, TypeCodeType> const & field = *i;
-
-      if (!(enc << TAO_OutputCDR::from_string (
-                       Traits<StringType>::get_string (field.name), 0))
-          || !marshal (enc,
-                       Traits<StringType>::get_typecode (field.type),
-                       offset + enc.total_length ()))
-        return false;
-    }
-
-  return
-    cdr << static_cast<CORBA::ULong> (enc.total_length ())
-    && cdr.write_octet_array_mb (enc.begin ());
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-void
-TAO::TypeCode::Struct<StringType,
-                      TypeCodeType,
-                      FieldArrayType,
-                      RefCountPolicy>::tao_duplicate (void)
-{
-  this->RefCountPolicy::add_ref ();
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-void
-TAO::TypeCode::Struct<StringType,
-                      TypeCodeType,
-                      FieldArrayType,
-                      RefCountPolicy>::tao_release (void)
-{
-  this->RefCountPolicy::remove_ref ();
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-CORBA::Boolean
-TAO::TypeCode::Struct<StringType,
-                      TypeCodeType,
-                      FieldArrayType,
-                      RefCountPolicy>::equal_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // This call shouldn't throw since CORBA::TypeCode::equal() verified
-  // that the TCKind is the same as our's prior to invoking this
-  // method, meaning that member_count() is supported.
-
-  CORBA::ULong const tc_nfields =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-  if (tc_nfields != this->nfields_)
-    return false;
-
-  for (CORBA::ULong i = 0; i < this->nfields_; ++i)
-    {
-      Struct_Field<StringType, TypeCodeType> const & lhs_field =
-        this->fields_[i];
-
-      char const * const lhs_name =
-        Traits<StringType>::get_string (lhs_field.name);
-      char const * const rhs_name = tc->member_name (i
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
-
-      if (ACE_OS::strcmp (lhs_name, rhs_name) != 0)
-        return false;
-
-      CORBA::TypeCode_ptr const lhs_tc =
-        Traits<StringType>::get_typecode (lhs_field.type);
-      CORBA::TypeCode_var const rhs_tc =
-        tc->member_type (i
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
-
-      CORBA::Boolean const equal_members =
-        lhs_tc->equal (rhs_tc.in ()
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
-
-      if (!equal_members)
-        return false;
-    }
-
-  return true;
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-CORBA::Boolean
-TAO::TypeCode::Struct<StringType,
-                      TypeCodeType,
-                      FieldArrayType,
-                      RefCountPolicy>::equivalent_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // Perform a structural comparison, excluding the name() and
-  // member_name() operations.
-
-  CORBA::ULong const tc_nfields =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-  if (tc_nfields != this->nfields_)
-    return false;
-
-  for (CORBA::ULong i = 0; i < this->nfields_; ++i)
-    {
-      CORBA::TypeCode_ptr const lhs =
-        Traits<StringType>::get_typecode (this->fields_[i].type);
-      CORBA::TypeCode_var const rhs =
-        tc->member_type (i
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
-
-      CORBA::Boolean const equiv_members =
-        lhs->equivalent (rhs.in ()
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
-
-      if (!equiv_members)
-        return false;
-    }
-
-  return true;
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-CORBA::TypeCode_ptr
-TAO::TypeCode::Struct<StringType,
-                      TypeCodeType,
-                      FieldArrayType,
-                      RefCountPolicy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
-{
-  ACE_Array_Base<Struct_Field<CORBA::String_var,
-                              CORBA::TypeCode_var> >
-    tc_fields (this->nfields_);
-
-  if (this->nfields_ > 0)
-    {
-      // Dynamically construct a new array of fields stripped of
-      // member names.
-
-      static char const empty_name[] = "";
-
-      for (CORBA::ULong i = 0; i < this->nfields_; ++i)
-        {
-          // Member names will be stripped, i.e. not embedded within
-          // the compact TypeCode.
-
-          tc_fields[i].name = empty_name;
-          tc_fields[i].type =
-            Traits<StringType>::get_typecode (
-              this->fields_[i].type)->get_compact_typecode (
-                ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-        }
-    }
-
-  TAO_TypeCodeFactory_Adapter * const adapter =
-    ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-      TAO_ORB_Core::typecodefactory_adapter_name ());
-
-  if (adapter == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        CORBA::TypeCode::_nil ());
-    }
-
-  return
-    adapter->create_struct_except_tc (this->kind_,
-                                      this->base_attributes_.id (),
-                                      ""  /* empty name */,
-                                      tc_fields,
-                                      this->nfields_
-                                      ACE_ENV_ARG_PARAMETER);
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-char const *
-TAO::TypeCode::Struct<StringType,
-                      TypeCodeType,
-                      FieldArrayType,
-                      RefCountPolicy>::id_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->base_attributes_.id ();
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-char const *
-TAO::TypeCode::Struct<StringType,
-                      TypeCodeType,
-                      FieldArrayType,
-                      RefCountPolicy>::name_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->base_attributes_.name ();
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-CORBA::ULong
-TAO::TypeCode::Struct<StringType,
-                      TypeCodeType,
-                      FieldArrayType,
-                      RefCountPolicy>::member_count_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->nfields_;
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-char const *
-TAO::TypeCode::Struct<StringType,
-                      TypeCodeType,
-                      FieldArrayType,
-                      RefCountPolicy>::member_name_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  if (index >= this->nfields_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
-
-  return Traits<StringType>::get_string (this->fields_[index].name);
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-CORBA::TypeCode_ptr
-TAO::TypeCode::Struct<StringType,
-                      TypeCodeType,
-                      FieldArrayType,
-                      RefCountPolicy>::member_type_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
-{
-  if (index >= this->nfields_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
-                      CORBA::TypeCode::_nil ());
-
-  return
-    CORBA::TypeCode::_duplicate (
-      Traits<StringType>::get_typecode (this->fields_[index].type));
-}
-
-#endif  /* TAO_STRUCT_TYPECODE_CPP */
diff --git a/TAO/tao/Struct_TypeCode.h b/TAO/tao/Struct_TypeCode.h
deleted file mode 100644
index 30420bca0a1..00000000000
--- a/TAO/tao/Struct_TypeCode.h
+++ /dev/null
@@ -1,156 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Struct_TypeCode.h
- *
- *  $Id$
- *
- *  Header file for a @c tk_struct and @c tk_except
- *  @c CORBA::TypeCodes.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- *  @author Carlos O'Ryan
- */
-//=============================================================================
-
-#ifndef TAO_STRUCT_TYPECODE_H
-#define TAO_STRUCT_TYPECODE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TypeCode.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TypeCode_Base_Attributes.h"
-
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    template<typename StringType, typename TypeCodeType> struct Struct_Field;
-
-    /**
-     * @class Struct
-     *
-     * @brief @c CORBA::TypeCode implementation for an OMG IDL
-     *        @c struct or @c exception.
-     *
-     * This class implements a @c CORBA::TypeCode for an OMG IDL
-     * @c struct or @c exception.
-     */
-    template <typename StringType,
-              typename TypeCodeType,
-              class FieldArrayType,
-              class RefCountPolicy>
-    class Struct
-      : public CORBA::TypeCode,
-        private RefCountPolicy
-    {
-    public:
-
-      /// Constructor.
-      Struct (CORBA::TCKind kind,
-              char const * id,
-              char const * name,
-              FieldArrayType const & fields,
-              CORBA::ULong nfields);
-
-      /// Constructor used for recursive TypeCodes.
-      Struct (CORBA::TCKind kind,
-              char const * id);
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
-      //@}
-
-    protected:
-
-      /**
-       * @name @c TAO CORBA::TypeCode Template Methods
-       *
-       * @c tk_struct or @c tk_except @c CORBA::TypeCode -specific
-       * template methods.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * member_name_i (CORBA::ULong index
-                                          ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index
-                                                 ACE_ENV_ARG_DECL) const;
-      //@}
-
-    protected:
-
-      /**
-       * @c Struct Attributes
-       *
-       * Attributes representing the structure of an OMG IDL
-       * @c struct or @c exception.
-       *
-       * @note These attributes are declared in the order in which
-       *       they are marshaled into a CDR stream in order to
-       *       increase cache hits by improving spatial locality.
-       */
-      //@{
-
-      /// Base attributes containing repository ID and name of
-      /// structure type.
-      Base_Attributes<StringType> base_attributes_;
-
-      /// The number of fields in the OMG IDL structure.
-      CORBA::ULong nfields_;
-
-      /// Array of @c TAO::TypeCode fields representing structure of the
-      /// OMG IDL defined @c struct.
-      FieldArrayType fields_;
-
-      //@}
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/Struct_TypeCode.inl"
-#endif  /* __ACE_INLINE__ */
-
-#ifdef ACE_TEMPLATES_REQUIRE_SOURCE
-# include "tao/Struct_TypeCode.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
-# pragma implementation ("Struct_TypeCode.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_STRUCT_TYPECODE_H */
diff --git a/TAO/tao/Struct_TypeCode.inl b/TAO/tao/Struct_TypeCode.inl
deleted file mode 100644
index eb3da52ae7e..00000000000
--- a/TAO/tao/Struct_TypeCode.inl
+++ /dev/null
@@ -1,47 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-ACE_INLINE
-TAO::TypeCode::Struct<StringType,
-                      TypeCodeType,
-                      FieldArrayType,
-                      RefCountPolicy>::Struct (
-  CORBA::TCKind kind,
-  char const * id,
-  char const * name,
-  FieldArrayType const & fields,
-  CORBA::ULong nfields)
-  : CORBA::TypeCode (kind)
-  , RefCountPolicy ()
-  , base_attributes_ (id, name)
-  , nfields_ (nfields)
-  , fields_ (fields)
-{
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-ACE_INLINE
-TAO::TypeCode::Struct<StringType,
-                      TypeCodeType,
-                      FieldArrayType,
-                      RefCountPolicy>::Struct (
-  CORBA::TCKind kind,
-  char const * id)
-  : CORBA::TypeCode (kind)
-  , RefCountPolicy ()
-  , base_attributes_ (id)
-  , nfields_ (0)
-  , fields_ ()
-{
-  // CORBA::tk_except is not allowed in the recursive TypeCode case.
-  // ACE_ASSERT (kind == CORBA::tk_struct);
-}
diff --git a/TAO/tao/Struct_TypeCode_Static.cpp b/TAO/tao/Struct_TypeCode_Static.cpp
deleted file mode 100644
index 0cbe55aa344..00000000000
--- a/TAO/tao/Struct_TypeCode_Static.cpp
+++ /dev/null
@@ -1,316 +0,0 @@
-// $Id$
-
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/TypeCode_Traits.h"
-#include "tao/ORB_Core.h"
-#include "tao/TypeCodeFactory_Adapter.h"
-#include "tao/CDR.h"
-
-
-#ifndef __ACE_INLINE__
-# include "tao/Struct_TypeCode_Static.inl"
-#endif  /* !__ACE_INLINE__ */
-
-#include "ace/Dynamic_Service.h"
-
-
-ACE_RCSID (tao,
-           Struct_TypeCode_Static,
-           "$Id$")
-
-
-bool
-TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *,
-                                                  CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>::tao_marshal (
-  TAO_OutputCDR & cdr,
-  CORBA::ULong offset) const
-{
-  // A tk_struct TypeCode has a "complex" parameter list type (see
-  // Table 15-2 in Section 15.3.5.1 "TypeCode" in the CDR section of
-  // the CORBA specification), meaning that it must be marshaled into
-  // a CDR encapsulation.
-
-  // Create a CDR encapsulation.
-  TAO_OutputCDR enc;
-
-  // Account for the encoded CDR encapsulation length and byte order.
-  //
-  // Aligning on an octet since the next value after the CDR
-  // encapsulation length will always be the byte order octet/boolean
-  // in this case.
-  offset = ACE_align_binary (offset + 4,
-                             ACE_CDR::OCTET_ALIGN);
-
-  bool const success =
-    (enc << TAO_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER))
-    && (enc << TAO_OutputCDR::from_string (this->base_attributes_.id (), 0))
-    && (enc << TAO_OutputCDR::from_string (this->base_attributes_.name (), 0))
-    && (enc << this->nfields_);
-
-  if (!success)
-    return false;
-
-  Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const begin =
-    &this->fields_[0];
-  Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const end =
-    begin + this->nfields_;
-
-  for (Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * i =
-         begin;
-       i != end;
-       ++i)
-    {
-      Struct_Field<char const *, CORBA::TypeCode_ptr const *> const & field =
-        *i;
-
-      if (!(enc << TAO_OutputCDR::from_string (
-                       Traits<char const *>::get_string (field.name), 0))
-          || !marshal (enc,
-                       Traits<char const *>::get_typecode (field.type),
-                       offset + enc.total_length ()))
-        return false;
-    }
-
-  return
-    cdr << static_cast<CORBA::ULong> (enc.total_length ())
-    && cdr.write_octet_array_mb (enc.begin ());
-}
-
-void
-TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *,
-                                                  CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>::tao_duplicate (void)
-{
-}
-
-void
-TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *,
-                                                  CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>::tao_release (void)
-{
-}
-
-CORBA::Boolean
-TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *,
-                                                  CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>::equal_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // This call shouldn't throw since CORBA::TypeCode::equal() verified
-  // that the TCKind is the same as our's prior to invoking this
-  // method, meaning that member_count() is supported.
-
-  CORBA::ULong const tc_nfields =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-  if (tc_nfields != this->nfields_)
-    return false;
-
-  for (CORBA::ULong i = 0; i < this->nfields_; ++i)
-    {
-      Struct_Field<char const *, CORBA::TypeCode_ptr const *> const &
-        lhs_field = this->fields_[i];
-
-      char const * const lhs_name =
-        Traits<char const *>::get_string (lhs_field.name);
-      char const * const rhs_name = tc->member_name (i
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
-
-      if (ACE_OS::strcmp (lhs_name, rhs_name) != 0)
-        return false;
-
-      CORBA::TypeCode_ptr const lhs_tc =
-        Traits<char const *>::get_typecode (lhs_field.type);
-      CORBA::TypeCode_var const rhs_tc =
-        tc->member_type (i
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
-
-      CORBA::Boolean const equal_members =
-        lhs_tc->equal (rhs_tc.in ()
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
-
-      if (!equal_members)
-        return false;
-    }
-
-  return true;
-}
-
-CORBA::Boolean
-TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *,
-                                                  CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>::equivalent_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // Perform a structural comparison, excluding the name() and
-  // member_name() operations.
-
-  CORBA::ULong const tc_nfields =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-  if (tc_nfields != this->nfields_)
-    return false;
-
-  for (CORBA::ULong i = 0; i < this->nfields_; ++i)
-    {
-      CORBA::TypeCode_ptr const lhs =
-        Traits<char const *>::get_typecode (this->fields_[i].type);
-      CORBA::TypeCode_var const rhs =
-        tc->member_type (i
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
-
-      CORBA::Boolean const equiv_members =
-        lhs->equivalent (rhs.in ()
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
-
-      if (!equiv_members)
-        return false;
-    }
-
-  return true;
-}
-
-CORBA::TypeCode_ptr
-TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *,
-                                                  CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
-{
-  ACE_Array_Base<Struct_Field<CORBA::String_var,
-                              CORBA::TypeCode_var> >
-    tc_fields (this->nfields_);
-
-  if (this->nfields_ > 0)
-    {
-      // Dynamically construct a new array of fields stripped of
-      // member names.
-
-      static char const empty_name[] = "";
-
-      for (CORBA::ULong i = 0; i < this->nfields_; ++i)
-        {
-          // Member names will be stripped, i.e. not embedded within
-          // the compact TypeCode.
-
-          tc_fields[i].name = empty_name;
-          tc_fields[i].type =
-            Traits<char const *>::get_typecode (
-              this->fields_[i].type)->get_compact_typecode (
-                ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-        }
-    }
-
-  TAO_TypeCodeFactory_Adapter * const adapter =
-    ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-      TAO_ORB_Core::typecodefactory_adapter_name ());
-
-  if (adapter == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        CORBA::TypeCode::_nil ());
-    }
-
-  return
-    adapter->create_struct_except_tc (this->kind_,
-                                      this->base_attributes_.id (),
-                                      ""  /* empty name */,
-                                      tc_fields,
-                                      this->nfields_
-                                      ACE_ENV_ARG_PARAMETER);
-}
-
-char const *
-TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *,
-                                                  CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>::id_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->base_attributes_.id ();
-}
-
-char const *
-TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *,
-                                                  CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>::name_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->base_attributes_.name ();
-}
-
-CORBA::ULong
-TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *,
-                                                  CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>::member_count_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->nfields_;
-}
-
-char const *
-TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *,
-                                                  CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>::member_name_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  if (index >= this->nfields_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
-
-  return Traits<char const *>::get_string (this->fields_[index].name);
-}
-
-CORBA::TypeCode_ptr
-TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *,
-                                                  CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>::member_type_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
-{
-  if (index >= this->nfields_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
-                      CORBA::TypeCode::_nil ());
-
-  return
-    CORBA::TypeCode::_duplicate (
-      Traits<char const *>::get_typecode (this->fields_[index].type));
-}
diff --git a/TAO/tao/Struct_TypeCode_Static.h b/TAO/tao/Struct_TypeCode_Static.h
deleted file mode 100644
index 8c87e1390ea..00000000000
--- a/TAO/tao/Struct_TypeCode_Static.h
+++ /dev/null
@@ -1,152 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Struct_TypeCode_Static.h
- *
- *  $Id$
- *
- *  Header file for static @c tk_struct and @c tk_except
- *  @c CORBA::TypeCodes.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- *  @author Carlos O'Ryan
- */
-//=============================================================================
-
-#ifndef TAO_STRUCT_TYPECODE_STATIC_H
-#define TAO_STRUCT_TYPECODE_STATIC_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TypeCode.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TypeCode_Base_Attributes.h"
-#include "tao/Null_RefCount_Policy.h"
-
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    template<typename StringType, typename TypeCodeType> struct Struct_Field;
-    template <typename StringType,
-              typename TypeCodeType,
-              class FieldArrayType,
-              class RefCountPolicy> class Struct;
-
-
-    /**
-     * @class Struct
-     *
-     * @brief @c CORBA::TypeCode implementation for an OMG IDL
-     *        @c struct or @c exception.
-     *
-     * This class implements a @c CORBA::TypeCode for an OMG IDL
-     * @c struct or @c exception.
-     */
-    template<>
-    class TAO_Export Struct<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            Struct_Field<char const *,
-                                         CORBA::TypeCode_ptr const *> const *,
-                            TAO::Null_RefCount_Policy>
-      : public CORBA::TypeCode,
-        private TAO::Null_RefCount_Policy
-    {
-    public:
-
-      /// Constructor.
-      Struct (CORBA::TCKind kind,
-              char const * id,
-              char const * name,
-              Struct_Field<char const *,
-                           CORBA::TypeCode_ptr const *> const * fields,
-              CORBA::ULong nfields);
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
-      //@}
-
-    protected:
-
-      /**
-       * @name @c TAO CORBA::TypeCode Template Methods
-       *
-       * @c tk_struct or @c tk_except @c CORBA::TypeCode -specific
-       * template methods.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * member_name_i (CORBA::ULong index
-                                          ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index
-                                                 ACE_ENV_ARG_DECL) const;
-      //@}
-
-    private:
-
-      /**
-       * @c Struct Attributes
-       *
-       * Attributes representing the structure of an OMG IDL
-       * @c struct or @c exception.
-       *
-       * @note These attributes are declared in the order in which
-       *       they are marshaled into a CDR stream in order to
-       *       increase cache hits by improving spatial locality.
-       */
-      //@{
-
-      /// Base attributes containing repository ID and name of
-      /// structure type.
-      Base_Attributes<char const *> const base_attributes_;
-
-      /// The number of fields in the OMG IDL structure.
-      CORBA::ULong const nfields_;
-
-      /// Array of @c TAO::TypeCode fields representing structure of the
-      /// OMG IDL defined @c struct.
-      Struct_Field<char const *,
-                   CORBA::TypeCode_ptr const *> const * const fields_;
-
-      //@}
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/Struct_TypeCode_Static.inl"
-#endif  /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_STRUCT_TYPECODE_H */
diff --git a/TAO/tao/Struct_TypeCode_Static.inl b/TAO/tao/Struct_TypeCode_Static.inl
deleted file mode 100644
index f32a858b845..00000000000
--- a/TAO/tao/Struct_TypeCode_Static.inl
+++ /dev/null
@@ -1,23 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-
-ACE_INLINE
-TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *,
-                                                  CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>::Struct (
-  CORBA::TCKind kind,
-  char const * id,
-  char const * name,
-  Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * fields,
-  CORBA::ULong nfields)
-  : CORBA::TypeCode (kind)
-  , ACE_NESTED_CLASS (TAO, Null_RefCount_Policy) ()
-  , base_attributes_ (id, name)
-  , nfields_ (nfields)
-  , fields_ (fields)
-{
-}
diff --git a/TAO/tao/Synch_Invocation.cpp b/TAO/tao/Synch_Invocation.cpp
index c0964e0c51c..8abaa8326b7 100644
--- a/TAO/tao/Synch_Invocation.cpp
+++ b/TAO/tao/Synch_Invocation.cpp
@@ -610,9 +610,7 @@ namespace TAO
       }
 
     CORBA::SystemException *ex =
-      TAO_Exceptions::create_system_exception (type_id.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
+      TAO_Exceptions::create_system_exception (type_id.in ());
 
     if (ex == 0)
       {
diff --git a/TAO/tao/Synch_Invocation.h b/TAO/tao/Synch_Invocation.h
index 4517d2bb32c..b4ff18b1a1a 100644
--- a/TAO/tao/Synch_Invocation.h
+++ b/TAO/tao/Synch_Invocation.h
@@ -38,7 +38,7 @@ namespace TAO
    * @brief All the action for a synchronous twoway invocation happen
    * here.
    *
-   * An object of this is type is created by TAO::Invocation_Adapter
+   * An object of this type is created by TAO::Invocation_Adapter
    * and invokes a method on this class. The method takes care of
    * creating and sending a request, waiting for a reply and
    * demarshalling the reply for the client.
diff --git a/TAO/tao/Synch_Queued_Message.h b/TAO/tao/Synch_Queued_Message.h
index 928883487be..84d768866c3 100644
--- a/TAO/tao/Synch_Queued_Message.h
+++ b/TAO/tao/Synch_Queued_Message.h
@@ -61,7 +61,7 @@ public:
 
   const ACE_Message_Block *current_block (void) const;
 
-  /** Implement the Template Methods from TAO_Queued_Message
+  /** @name Implement the Template Methods from TAO_Queued_Message
    */
   //@{
   virtual size_t message_length (void) const;
diff --git a/TAO/tao/Synch_Reply_Dispatcher.h b/TAO/tao/Synch_Reply_Dispatcher.h
index f103dd2779a..6774d5c2d87 100644
--- a/TAO/tao/Synch_Reply_Dispatcher.h
+++ b/TAO/tao/Synch_Reply_Dispatcher.h
@@ -37,7 +37,7 @@ namespace IOP
 /**
  * @class TAO_Synch_Reply_Dispatcher
  *
- * @brief Reply dispatcher for Synchoronous Method Invocation (SMI)s.
+ * @brief Reply dispatcher for Synchronous Method Invocation (SMI)s.
  *
  */
 class TAO_Export TAO_Synch_Reply_Dispatcher
diff --git a/TAO/tao/SystemException.cpp b/TAO/tao/SystemException.cpp
index 1dd155c7e51..677f507c50c 100644
--- a/TAO/tao/SystemException.cpp
+++ b/TAO/tao/SystemException.cpp
@@ -1,18 +1,18 @@
 // $Id$
 
 #include "SystemException.h"
-#include "Any_SystemException.h"
 #include "Environment.h"
 #include "ORB_Constants.h"
 #include "CORBA_String.h"
 #include "CDR.h"
 #include "debug.h"
+#include "AnyTypeCode_Adapter.h"
 
 #include "ace/Malloc.h"
 #include "ace/SString.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_stdio.h"
-
+#include "ace/Dynamic_Service.h"
 
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
 // Needed for ostream& operator<< (ostream &os, const CORBA::Exception &e)
@@ -86,7 +86,6 @@ CORBA::SystemException::SystemException (CORBA::ULong code,
 {
 }
 
-
 CORBA::SystemException::SystemException (const CORBA::SystemException &src)
   : CORBA::Exception (src),
     minor_ (src.minor_),
@@ -109,16 +108,6 @@ CORBA::SystemException::operator= (const CORBA::SystemException &src)
   return *this;
 }
 
-
-int
-CORBA::SystemException::_is_a (const char* interface_id) const
-{
-  return ((ACE_OS::strcmp (interface_id, this->_rep_id ()) == 0) ||
-          (ACE_OS::strcmp (interface_id,
-                           "IDL:omg.org/CORBA/SystemException:1.0") == 0)
-          || this->Exception::_is_a (interface_id));
-}
-
 void
 CORBA::SystemException::_tao_encode (TAO_OutputCDR &cdr
                                      ACE_ENV_ARG_DECL) const
@@ -574,7 +563,7 @@ CORBA::SystemException::_tao_get_omg_exception_description (
       "Operation not implemented in local object"   // 8
     };
 
-  static const char *NO_RESOURCE_TABLE[] =
+  static const char *NO_RESOURCES_TABLE[] =
     {
       "Portable Interceptor operation not support in this binding.", // 1
       "No connection for request's priority."                        // 2
@@ -691,87 +680,129 @@ CORBA::SystemException::_tao_get_omg_exception_description (
 
   minor_code--;  // Adjust to match table offset.
 
-  if (exc._is_a ("IDL:omg.org/CORBA/UNKNOWN:1.0")
+  CORBA::UNKNOWN const * unknown_exception =
+    dynamic_cast <const CORBA::UNKNOWN *> (&exc);
+  if (unknown_exception != 0
       && minor_code < sizeof UNKNOWN_TABLE / sizeof (char *))
     return UNKNOWN_TABLE[minor_code];
 
-  if (exc._is_a ("IDL:omg.org/CORBA/BAD_PARAM:1.0")
+  CORBA::BAD_PARAM const * bad_param__exception =
+    dynamic_cast <const CORBA::BAD_PARAM *> (&exc);
+  if (bad_param__exception != 0
       && minor_code < sizeof BAD_PARAM_TABLE / sizeof (char *))
     return BAD_PARAM_TABLE[minor_code];
 
-  if (exc._is_a ("IDL:omg.org/CORBA/IMP_LIMIT:1.0")
+  CORBA::IMP_LIMIT const * imp_limit_exception =
+    dynamic_cast <const CORBA::IMP_LIMIT *> (&exc);
+  if (imp_limit_exception != 0
       && minor_code < sizeof IMP_LIMIT_TABLE / sizeof (char *))
     return IMP_LIMIT_TABLE[minor_code];
 
-  if (exc._is_a ("IDL:omg.org/CORBA/INITIALIZE:1.0")
+  CORBA::INITIALIZE const * initialize_exception =
+    dynamic_cast <const CORBA::INITIALIZE *> (&exc);
+  if (initialize_exception != 0
       && minor_code < sizeof INITIALIZE_TABLE / sizeof (char *))
     return INITIALIZE_TABLE[minor_code];
 
-  if (exc._is_a ("IDL:omg.org/CORBA/INV_OBJREF:1.0")
+  CORBA::INV_OBJREF const * inv_objref_exception =
+    dynamic_cast <const CORBA::INV_OBJREF *> (&exc);
+  if (inv_objref_exception != 0
       && minor_code < sizeof INV_OBJREF_TABLE / sizeof (char *))
     return INV_OBJREF_TABLE[minor_code];
 
-  if (exc._is_a ("IDL:omg.org/CORBA/MARSHAL:1.0")
+  CORBA::MARSHAL const * marshal_exception =
+    dynamic_cast <const CORBA::MARSHAL *> (&exc);
+  if (marshal_exception != 0
       && minor_code < sizeof MARSHAL_TABLE / sizeof (char *))
     return MARSHAL_TABLE[minor_code];
 
-  if (exc._is_a ("IDL:omg.org/CORBA/BAD_TYPECODE:1.0")
+  CORBA::BAD_TYPECODE const * bad_typecode_exception =
+    dynamic_cast <const CORBA::BAD_TYPECODE *> (&exc);
+  if (bad_typecode_exception != 0
       && minor_code < sizeof BAD_TYPECODE_TABLE / sizeof (char *))
     return BAD_TYPECODE_TABLE[minor_code];
 
-  if (exc._is_a ("IDL:omg.org/CORBA/NO_IMPLEMENT:1.0")
+  CORBA::NO_IMPLEMENT const * no_implement_exception =
+    dynamic_cast <const CORBA::NO_IMPLEMENT *> (&exc);
+  if (no_implement_exception != 0
       && minor_code < sizeof NO_IMPLEMENT_TABLE / sizeof (char *))
     return NO_IMPLEMENT_TABLE[minor_code];
 
-  if (exc._is_a ("IDL:omg.org/CORBA/NO_RESOURCE:1.0")
-      && minor_code < sizeof NO_RESOURCE_TABLE / sizeof (char *))
-    return NO_RESOURCE_TABLE[minor_code];
+  CORBA::NO_RESOURCES const * no_resource_exception =
+    dynamic_cast <const CORBA::NO_RESOURCES *> (&exc);
+  if (no_resource_exception != 0
+      && minor_code < sizeof NO_RESOURCES_TABLE / sizeof (char *))
+    return NO_RESOURCES_TABLE[minor_code];
 
-  if (exc._is_a ("IDL:omg.org/CORBA/BAD_INV_ORDER:1.0")
+  CORBA::BAD_INV_ORDER const * bad_inv_order_exception =
+    dynamic_cast <const CORBA::BAD_INV_ORDER *> (&exc);
+  if (bad_inv_order_exception != 0
       && minor_code < sizeof BAD_INV_ORDER_TABLE / sizeof (char *))
     return BAD_INV_ORDER_TABLE[minor_code];
 
-  if (exc._is_a ("IDL:omg.org/CORBA/TRANSIENT:1.0")
+  CORBA::TRANSIENT const * transient_exception =
+    dynamic_cast <const CORBA::TRANSIENT *> (&exc);
+  if (transient_exception != 0
       && minor_code < sizeof TRANSIENT_TABLE / sizeof (char *))
     return TRANSIENT_TABLE[minor_code];
 
-  if (exc._is_a ("IDL:omg.org/CORBA/OBJ_ADAPTER:1.0")
+  CORBA::OBJ_ADAPTER const * obj_adapter_exception =
+    dynamic_cast <const CORBA::OBJ_ADAPTER *> (&exc);
+  if (obj_adapter_exception != 0
       && minor_code < sizeof OBJ_ADAPTER_TABLE / sizeof (char *))
     return OBJ_ADAPTER_TABLE[minor_code];
 
-  if (exc._is_a ("IDL:omg.org/CORBA/DATA_CONVERSION:1.0")
+  CORBA::DATA_CONVERSION const * data_conversion_exception =
+    dynamic_cast <const CORBA::DATA_CONVERSION *> (&exc);
+  if (data_conversion_exception != 0
       && minor_code < sizeof DATA_CONVERSION_TABLE / sizeof (char *))
     return DATA_CONVERSION_TABLE[minor_code];
 
-  if (exc._is_a ("IDL:omg.org/CORBA/OBJECT_NOT_EXIST:1.0")
+  CORBA::OBJECT_NOT_EXIST const * object_not_exist_exception =
+    dynamic_cast <const CORBA::OBJECT_NOT_EXIST *> (&exc);
+  if (object_not_exist_exception != 0
       && minor_code < sizeof OBJECT_NOT_EXIST_TABLE / sizeof (char *))
     return OBJECT_NOT_EXIST_TABLE[minor_code];
 
-  if (exc._is_a ("IDL:omg.org/CORBA/INV_POLICY:1.0")
+  CORBA::INV_POLICY const * inv_policy_exception =
+    dynamic_cast <const CORBA::INV_POLICY *> (&exc);
+  if (inv_policy_exception != 0
       && minor_code < sizeof INV_POLICY_TABLE / sizeof (char *))
     return INV_POLICY_TABLE[minor_code];
 
-  if (exc._is_a ("IDL:omg.org/CORBA/ACTIVITY_COMPLETED:1.0")
+  CORBA::ACTIVITY_COMPLETED const * activity_completed_exception =
+    dynamic_cast <const CORBA::ACTIVITY_COMPLETED *> (&exc);
+  if (activity_completed_exception != 0
       && minor_code < sizeof ACTIVITY_COMPLETED_TABLE / sizeof (char *))
     return ACTIVITY_COMPLETED_TABLE[minor_code];
 
-  if (exc._is_a ("IDL:omg.org/CORBA/ACTIVITY_REQUIRED:1.0")
+  CORBA::ACTIVITY_REQUIRED const * activity_required_exception =
+    dynamic_cast <const CORBA::ACTIVITY_REQUIRED *> (&exc);
+  if (activity_required_exception != 0
       && minor_code < sizeof ACTIVITY_REQUIRED_TABLE / sizeof (char *))
     return ACTIVITY_REQUIRED_TABLE[minor_code];
 
-  if (exc._is_a ("IDL:omg.org/CORBA/BAD_OPERATION:1.0")
+  CORBA::BAD_OPERATION const * bad_operation_exception =
+    dynamic_cast <const CORBA::BAD_OPERATION *> (&exc);
+  if (bad_operation_exception != 0
       && minor_code < sizeof BAD_OPERATION_TABLE / sizeof (char *))
     return BAD_OPERATION_TABLE[minor_code];
 
-  if (exc._is_a ("IDL:omg.org/CORBA/BAD_CONTEXT:1.0")
+  CORBA::BAD_CONTEXT const * bad_context_exception =
+    dynamic_cast <const CORBA::BAD_CONTEXT *> (&exc);
+  if (bad_context_exception != 0
       && minor_code < sizeof BAD_CONTEXT_TABLE / sizeof (char *))
     return BAD_CONTEXT_TABLE[minor_code];
 
-  if (exc._is_a ("IDL:omg.org/CORBA/CODESET_INCOMPATIBLE:1.0")
+  CORBA::CODESET_INCOMPATIBLE const * codeset_incompatible_exception =
+    dynamic_cast <const CORBA::CODESET_INCOMPATIBLE *> (&exc);
+  if (codeset_incompatible_exception != 0
       && minor_code < sizeof CODESET_INCOMPATIBLE_TABLE / sizeof (char *))
     return CODESET_INCOMPATIBLE_TABLE[minor_code];
 
-  if (exc._is_a ("IDL:omg.org/CORBA/INTF_REPOS:1.0")
+  CORBA::INTF_REPOS const * intf_repos_exception =
+    dynamic_cast <const CORBA::INTF_REPOS *> (&exc);
+  if (intf_repos_exception != 0
       && minor_code < sizeof INTF_REPOS_TABLE / sizeof (char *))
     return INTF_REPOS_TABLE[minor_code];
 
@@ -846,6 +877,7 @@ static const char *repo_id_array[] = {
 static const CORBA::ULong array_sz =
   (sizeof (repo_id_array) / sizeof (char const *)) - 1;
 
+
 TAO::excp_factory excp_array [] = {
 #define TAO_SYSTEM_EXCEPTION(name) \
       &CORBA::name::_tao_create,
@@ -854,9 +886,41 @@ TAO::excp_factory excp_array [] = {
       0
 };
 
+#define TAO_SYSTEM_EXCEPTION(name) \
+CORBA::TypeCode_ptr \
+CORBA::name ::_tao_type (void) const \
+{ \
+  TAO_AnyTypeCode_Adapter *adapter = \
+    ACE_Dynamic_Service<TAO_AnyTypeCode_Adapter>::instance ( \
+        "AnyTypeCode_Adapter" \
+      ); \
+  if (adapter != 0) \
+    return adapter->_tao_type_ ## name (); \
+  else \
+    { \
+      ACE_ERROR ((LM_ERROR, \
+                  ACE_TEXT ("(%P|%t) %p\n"), \
+                  ACE_TEXT ("Unable to find the ") \
+                  ACE_TEXT ("AnyTypeCode Adapter instance"))); \
+      return 0; \
+    } \
+}
+
+STANDARD_EXCEPTION_LIST
+#undef  TAO_SYSTEM_EXCEPTION
+
+#define TAO_SYSTEM_EXCEPTION(name) \
+void \
+CORBA::name ::_tao_any_destructor (void * x) \
+{ \
+  delete static_cast<CORBA::name *> (x); \
+}
+
+STANDARD_EXCEPTION_LIST
+#undef TAO_SYSTEM_EXCEPTION
+
 CORBA::SystemException *
-TAO_Exceptions::create_system_exception (const char *id
-                                         ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Exceptions::create_system_exception (const char *id)
 {
   for (CORBA::ULong i = 0; i < array_sz; ++i)
     {
diff --git a/TAO/tao/SystemException.h b/TAO/tao/SystemException.h
index cb34d66a6fb..abfc5f4165d 100644
--- a/TAO/tao/SystemException.h
+++ b/TAO/tao/SystemException.h
@@ -45,13 +45,17 @@ class TAO_InputCDR;
 
 namespace CORBA
 {
-  class TypeCode;
-  typedef TypeCode *TypeCode_ptr;
+  class SystemException;
+}
 
-  class Environment;
+namespace TAO
+{
+  typedef CORBA::SystemException* (*excp_factory)(void);
+}
 
-  class Any;
-  typedef Any *Any_ptr;
+namespace CORBA
+{
+  class Environment;
 
   /**
    * @enum CompletionStatus
@@ -84,7 +88,7 @@ namespace CORBA
     SystemException (const SystemException & src);
 
     /// Destructor.
-    ~SystemException (void);
+    virtual ~SystemException (void);
 
     /// Get the minor status.
     ULong minor (void) const;
@@ -101,31 +105,26 @@ namespace CORBA
     /// Narrow to a SystemException.
     static SystemException *_downcast (CORBA::Exception *exception);
 
-        /// The const version of narrow operation to a SystemException
+    /// The const version of narrow operation to a SystemException
     static const SystemException *_downcast(const CORBA::Exception *exception);
 
     virtual void _raise (void) const = 0;
 
     // = TAO-specific extension.
 
-    /// Helper for the _downcast operation.
-    virtual int _is_a (const char *type_id) const;
-
     /// Print the system exception @c ex to output determined by @c f.
     /// This function is not CORBA compliant.
     void _tao_print_system_exception (FILE *f = stdout) const;
 
-    /// Create an exception from the available exception
-    /// virtual CORBA::Exception *_tao_duplicate (void) const;
-
     /// Returns a string containing information about the exception. This
     /// function is not CORBA compliant.
     virtual ACE_CString _info (void) const;
 
     virtual void _tao_encode (TAO_OutputCDR &cdr
-                              ACE_ENV_ARG_DECL_NOT_USED) const;
+                              ACE_ENV_ARG_DECL) const;
+
     virtual void _tao_decode (TAO_InputCDR &cdr
-                              ACE_ENV_ARG_DECL_NOT_USED);
+                              ACE_ENV_ARG_DECL);
 
     /// Helper to create a minor status value.
     static CORBA::ULong _tao_minor_code (u_int location,
@@ -135,8 +134,7 @@ namespace CORBA
     /// value.
     static CORBA::ULong _tao_errno (int errno_value);
 
-    /// Overridden base class method to help compilers that use
-    /// explicit template instantiations get going.
+    /// Deep copy
     virtual CORBA::Exception *_tao_duplicate (void) const;
 
   protected:
@@ -192,11 +190,6 @@ namespace CORBA
       virtual CORBA::Exception *_tao_duplicate (void) const; \
       static CORBA::SystemException *_tao_create (void); \
     }; \
-  TAO_Export void operator<<= (CORBA::Any &, const CORBA::name &); \
-  TAO_Export void operator<<= (CORBA::Any &, CORBA::name *); \
-  TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, \
-                                         const CORBA::name *&); \
-  extern TAO_Export TypeCode_ptr const _tc_ ## name
 
   TAO_SYSTEM_EXCEPTION(UNKNOWN);          // the unknown exception
   TAO_SYSTEM_EXCEPTION(BAD_PARAM);        // an invalid parameter was passed
diff --git a/TAO/tao/SystemExceptionA.cpp b/TAO/tao/SystemExceptionA.cpp
deleted file mode 100644
index 1ec437e599a..00000000000
--- a/TAO/tao/SystemExceptionA.cpp
+++ /dev/null
@@ -1,202 +0,0 @@
-// $Id$
-
-#include "SystemException.h"
-#include "Any_SystemException.h"
-#include "Any_Dual_Impl_T.h"
-#include "TypeCode.h"
-#include "TypeCode_Constants.h"
-#include "Enum_TypeCode_Static.h"
-#include "TypeCode_Struct_Field.h"
-#include "Struct_TypeCode_Static.h"
-#include "Null_RefCount_Policy.h"
-#include "CORBA_String.h"
-
-
-ACE_RCSID (tao,
-           SystemExceptionA,
-           "$Id$")
-
-
-#if defined (ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO)
-#undef THREAD_CANCELLED
-#endif /* ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO */
-
-// List of standard/system exceptions ... used to create static
-// storage for their typecodes.
-
-#define STANDARD_EXCEPTION_LIST \
-    TAO_SYSTEM_EXCEPTION (UNKNOWN) \
-    TAO_SYSTEM_EXCEPTION (BAD_PARAM) \
-    TAO_SYSTEM_EXCEPTION (NO_MEMORY) \
-    TAO_SYSTEM_EXCEPTION (IMP_LIMIT) \
-    TAO_SYSTEM_EXCEPTION (COMM_FAILURE) \
-    TAO_SYSTEM_EXCEPTION (INV_OBJREF) \
-    TAO_SYSTEM_EXCEPTION (OBJECT_NOT_EXIST) \
-    TAO_SYSTEM_EXCEPTION (NO_PERMISSION) \
-    TAO_SYSTEM_EXCEPTION (INTERNAL) \
-    TAO_SYSTEM_EXCEPTION (MARSHAL) \
-    TAO_SYSTEM_EXCEPTION (INITIALIZE) \
-    TAO_SYSTEM_EXCEPTION (NO_IMPLEMENT) \
-    TAO_SYSTEM_EXCEPTION (BAD_TYPECODE) \
-    TAO_SYSTEM_EXCEPTION (BAD_OPERATION) \
-    TAO_SYSTEM_EXCEPTION (NO_RESOURCES) \
-    TAO_SYSTEM_EXCEPTION (NO_RESPONSE) \
-    TAO_SYSTEM_EXCEPTION (PERSIST_STORE) \
-    TAO_SYSTEM_EXCEPTION (BAD_INV_ORDER) \
-    TAO_SYSTEM_EXCEPTION (TRANSIENT) \
-    TAO_SYSTEM_EXCEPTION (FREE_MEM) \
-    TAO_SYSTEM_EXCEPTION (INV_IDENT) \
-    TAO_SYSTEM_EXCEPTION (INV_FLAG) \
-    TAO_SYSTEM_EXCEPTION (INTF_REPOS) \
-    TAO_SYSTEM_EXCEPTION (BAD_CONTEXT) \
-    TAO_SYSTEM_EXCEPTION (OBJ_ADAPTER) \
-    TAO_SYSTEM_EXCEPTION (DATA_CONVERSION) \
-    TAO_SYSTEM_EXCEPTION (INV_POLICY) \
-    TAO_SYSTEM_EXCEPTION (REBIND) \
-    TAO_SYSTEM_EXCEPTION (TIMEOUT) \
-    TAO_SYSTEM_EXCEPTION (TRANSACTION_UNAVAILABLE) \
-    TAO_SYSTEM_EXCEPTION (TRANSACTION_MODE) \
-    TAO_SYSTEM_EXCEPTION (TRANSACTION_REQUIRED) \
-    TAO_SYSTEM_EXCEPTION (TRANSACTION_ROLLEDBACK) \
-    TAO_SYSTEM_EXCEPTION (INVALID_TRANSACTION) \
-    TAO_SYSTEM_EXCEPTION (CODESET_INCOMPATIBLE) \
-    TAO_SYSTEM_EXCEPTION (BAD_QOS) \
-    TAO_SYSTEM_EXCEPTION (INVALID_ACTIVITY) \
-    TAO_SYSTEM_EXCEPTION (ACTIVITY_COMPLETED) \
-    TAO_SYSTEM_EXCEPTION (ACTIVITY_REQUIRED) \
-    TAO_SYSTEM_EXCEPTION (THREAD_CANCELLED)
-
-#define TAO_SYSTEM_EXCEPTION(name) \
-CORBA::TypeCode_ptr \
-CORBA::name ::_tao_type (void) const \
-{ \
-  return CORBA::_tc_ ## name; \
-}
-
-STANDARD_EXCEPTION_LIST
-#undef TAO_SYSTEM_EXCEPTION
-
-#define TAO_SYSTEM_EXCEPTION(name) \
-void \
-CORBA::name ::_tao_any_destructor (void * x) \
-{ \
-  delete static_cast<CORBA::name *> (x); \
-}
-
-STANDARD_EXCEPTION_LIST
-#undef TAO_SYSTEM_EXCEPTION
-
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    char const * const enumerators_CORBA_CompletionStatus[] =
-      {
-        "COMPLETED_YES",
-        "COMPLETED_NO",
-        "COMPLETED_MAYBE"
-      };
-
-    Enum<char const *,
-         char const * const *,
-         TAO::Null_RefCount_Policy>
-      tc_CompletionStatus ("IDL:omg.org/CORBA/CompletionStatus:1.0",
-                           "CompletionStatus",
-                           enumerators_CORBA_CompletionStatus,
-                           3 /* # of enumerators */);
-  }
-}
-
-namespace CORBA
-{
-  // An internal TypeCode.
-  TypeCode_ptr const _tc_CompletionStatus =
-    &TAO::TypeCode::tc_CompletionStatus;
-}
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    Struct_Field<char const *,
-                 CORBA::TypeCode_ptr const *> const
-    fields_CORBA_SystemException[] =
-      {
-        { "minor",     &CORBA::_tc_ulong },
-        { "completed", &CORBA::_tc_CompletionStatus }
-      };
-
-    typedef TAO::TypeCode::Struct<char const *,
-                                  CORBA::TypeCode_ptr const *,
-                                  TAO::TypeCode::Struct_Field<char const *,
-                                                              CORBA::TypeCode_ptr const *> const *,
-                                  TAO::Null_RefCount_Policy> tc_SystemException;
-  }
-}
-
-#define TAO_SYSTEM_EXCEPTION(name) \
-namespace TAO \
-{ \
-  namespace TypeCode \
-  { \
-    tc_SystemException tc_CORBA_ ## name ( \
-      CORBA::tk_except, \
-      "IDL:omg.org/CORBA/" #name ":1.0", \
-      #name, \
-      TAO::TypeCode::fields_CORBA_SystemException, \
-      2 /* # of fields */); \
-  } \
-} \
-CORBA::TypeCode_ptr const CORBA::_tc_ ## name = \
-    &TAO::TypeCode::tc_CORBA_ ## name;
-
-STANDARD_EXCEPTION_LIST
-#undef  TAO_SYSTEM_EXCEPTION
-
-
-#define TAO_SYSTEM_EXCEPTION(name) \
-void \
-CORBA::operator<<= (CORBA::Any &any, const CORBA::name &ex) \
-{ \
-  TAO::Any_SystemException::insert_copy ( \
-      any, \
-      CORBA::name ::_tao_any_destructor, \
-      CORBA::_tc_ ## name, \
-      ex \
-    ); \
-}
-
-STANDARD_EXCEPTION_LIST
-#undef TAO_SYSTEM_EXCEPTION
-
-#define TAO_SYSTEM_EXCEPTION(name) \
-void \
-CORBA::operator<<= (CORBA::Any &any, CORBA::name *ex) \
-{ \
-  TAO::Any_SystemException::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 operator>>= (const CORBA::Any &any, \
-                            const CORBA::name *&ex) \
-{ \
-  return \
-    TAO::Any_SystemException::extract ( \
-        any, \
-        CORBA::name ::_tao_any_destructor, \
-        CORBA::_tc_ ## name, \
-        (const CORBA::SystemException *&) ex, \
-        &CORBA::name ::_tao_create); \
-}
-
-STANDARD_EXCEPTION_LIST
-#undef TAO_SYSTEM_EXCEPTION
diff --git a/TAO/tao/TAOA.cpp b/TAO/tao/TAOA.cpp
deleted file mode 100644
index fec81c09e9c..00000000000
--- a/TAO/tao/TAOA.cpp
+++ /dev/null
@@ -1,240 +0,0 @@
-// -*- 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/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "TAOC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/Recursive_Type_TypeCode.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_TAO_BufferingConstraintMode (
-    CORBA::tk_alias,
-    "IDL:tao/TAO/BufferingConstraintMode:1.0",
-    "BufferingConstraintMode",
-    &CORBA::_tc_ushort);
-  
-namespace TAO
-{
-  ::CORBA::TypeCode_ptr const _tc_BufferingConstraintMode =
-    &_tao_tc_TAO_BufferingConstraintMode;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_TAO_BufferingConstraint[] =
-  {
-    { "mode", &TAO::_tc_BufferingConstraintMode },
-    { "timeout", &TimeBase::_tc_TimeT },
-    { "message_count", &CORBA::_tc_ulong },
-    { "message_bytes", &CORBA::_tc_ulong }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_TAO_BufferingConstraint (
-    CORBA::tk_struct,
-    "IDL:tao/TAO/BufferingConstraint:1.0",
-    "BufferingConstraint",
-    _tao_fields_TAO_BufferingConstraint,
-    4);
-  
-namespace TAO
-{
-  ::CORBA::TypeCode_ptr const _tc_BufferingConstraint =
-    &_tao_tc_TAO_BufferingConstraint;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_TAO_BufferingConstraintPolicy (
-    CORBA::tk_local_interface,
-    "IDL:tao/TAO/BufferingConstraintPolicy:1.0",
-    "BufferingConstraintPolicy");
-  
-namespace TAO
-{
-  ::CORBA::TypeCode_ptr const _tc_BufferingConstraintPolicy =
-    &_tao_tc_TAO_BufferingConstraintPolicy;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const TAO::BufferingConstraint &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<TAO::BufferingConstraint>::insert_copy (
-      _tao_any,
-      TAO::BufferingConstraint::_tao_any_destructor,
-      TAO::_tc_BufferingConstraint,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    TAO::BufferingConstraint *_tao_elem
-  )
-{
-  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).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    TAO::BufferingConstraint *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const TAO::BufferingConstraint *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const TAO::BufferingConstraint *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<TAO::BufferingConstraint>::extract (
-        _tao_any,
-        TAO::BufferingConstraint::_tao_any_destructor,
-        TAO::_tc_BufferingConstraint,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<TAO::BufferingConstraintPolicy>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<TAO::BufferingConstraintPolicy>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<TAO::BufferingConstraintPolicy>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    TAO::BufferingConstraintPolicy_ptr _tao_elem
-  )
-{
-  TAO::BufferingConstraintPolicy_ptr _tao_objptr =
-    TAO::BufferingConstraintPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    TAO::BufferingConstraintPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<TAO::BufferingConstraintPolicy>::insert (
-      _tao_any,
-      TAO::BufferingConstraintPolicy::_tao_any_destructor,
-      TAO::_tc_BufferingConstraintPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    TAO::BufferingConstraintPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<TAO::BufferingConstraintPolicy>::extract (
-        _tao_any,
-        TAO::BufferingConstraintPolicy::_tao_any_destructor,
-        TAO::_tc_BufferingConstraintPolicy,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/TAOC.cpp b/TAO/tao/TAOC.cpp
index 72b89820afc..9ec2b85fff5 100644
--- a/TAO/tao/TAOC.cpp
+++ b/TAO/tao/TAOC.cpp
@@ -26,17 +26,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
 #include "TAOC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
@@ -101,14 +97,6 @@ TAO::BufferingConstraintPolicy::BufferingConstraintPolicy (void)
 TAO::BufferingConstraintPolicy::~BufferingConstraintPolicy (void)
 {}
 
-void 
-TAO::BufferingConstraintPolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  BufferingConstraintPolicy *_tao_tmp_pointer =
-    static_cast<BufferingConstraintPolicy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
 TAO::BufferingConstraintPolicy_ptr
 TAO::BufferingConstraintPolicy::_narrow (
     CORBA::Object_ptr _tao_objref
diff --git a/TAO/tao/TAOC.h b/TAO/tao/TAOC.h
index 188db5dc4cb..72e9467c9ef 100644
--- a/TAO/tao/TAOC.h
+++ b/TAO/tao/TAOC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_TAOC_H_
-#define _TAO_IDL_ORIG_TAOC_H_
+#ifndef _TAO_IDL_TAOC_H_
+#define _TAO_IDL_TAOC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -57,17 +57,8 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#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
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace TAO
 {
@@ -79,11 +70,6 @@ namespace TAO
   typedef CORBA::UShort_out BufferingConstraintMode_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_BufferingConstraintMode;
-  
-  // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
   
   const TAO::BufferingConstraintMode BUFFER_FLUSH = 0U;
@@ -119,7 +105,7 @@ namespace TAO
     BufferingConstraint_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
+  // be\be_visitor_structure/structure_ch.cpp:57
   
   struct TAO_Export BufferingConstraint
   {
@@ -133,11 +119,6 @@ namespace TAO
   };
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_BufferingConstraint;
-  
-  // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
   
   const CORBA::PolicyType BUFFERING_CONSTRAINT_POLICY_TYPE = 1413545985U;
@@ -198,7 +179,7 @@ namespace TAO
       return static_cast<BufferingConstraintPolicy_ptr> (0);
     }
     
-    static void _tao_any_destructor (void *);
+    
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -257,11 +238,6 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_BufferingConstraintPolicy;
-  
-  // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
   
   const Messaging::SyncScope SYNC_EAGER_BUFFERING = 0;
@@ -272,7 +248,7 @@ namespace TAO
   const Messaging::SyncScope SYNC_DELAYED_BUFFERING = -2;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module TAO
 
@@ -283,8 +259,8 @@ namespace TAO
 namespace TAO
 {
 
-#if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY__TRAITS_CH_)
-#define _TAO_BUFFERINGCONSTRAINTPOLICY__TRAITS_CH_
+#if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY__TRAITS_)
+#define _TAO_BUFFERINGCONSTRAINTPOLICY__TRAITS_
   
   template<>
   struct TAO_Export Objref_Traits< ::TAO::BufferingConstraintPolicy>
@@ -306,36 +282,13 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// 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 *&);
-
-// TAO_IDL - Generated from
-// 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
 // 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
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+// be\be_codegen.cpp:1028
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/TAO_Server_Request.cpp b/TAO/tao/TAO_Server_Request.cpp
index b95b1b41038..c7075d34bf7 100644
--- a/TAO/tao/TAO_Server_Request.cpp
+++ b/TAO/tao/TAO_Server_Request.cpp
@@ -14,6 +14,7 @@
 
 #if TAO_HAS_INTERCEPTORS == 1
 #include "PortableInterceptorC.h"
+#include "ServerRequestInterceptor_Adapter.h"
 #endif
 
 #if !defined (__ACE_INLINE__)
@@ -72,8 +73,8 @@ TAO_ServerRequest::TAO_ServerRequest (TAO_Pluggable_Messaging *mesg_base,
     argument_flag_ (1)
 #if TAO_HAS_INTERCEPTORS == 1
     , interceptor_count_ (0)
-    , rs_pi_current_ ()
-    , pi_current_copy_callback_ ()
+    , rs_pi_current_ (0)
+    , pi_current_copy_callback_ (0)
     , result_seq_ (0)
     , caught_exception_ (0)
     , reply_status_ (-1)
@@ -115,7 +116,8 @@ TAO_ServerRequest::TAO_ServerRequest (TAO_Pluggable_Messaging *mesg_base,
     argument_flag_ (true)
 #if TAO_HAS_INTERCEPTORS == 1
   , interceptor_count_ (0)
-  , rs_pi_current_ ()
+  , rs_pi_current_ (0)
+  , pi_current_copy_callback_ (0)
   , result_seq_ (0)
   , caught_exception_ (0)
   , reply_status_ (-1)
@@ -150,7 +152,8 @@ TAO_ServerRequest::TAO_ServerRequest (TAO_ORB_Core * orb_core,
     argument_flag_ (false)
 #if TAO_HAS_INTERCEPTORS == 1
   , interceptor_count_ (0)
-  , rs_pi_current_ ()
+  , rs_pi_current_ (0)
+  , pi_current_copy_callback_ (0)
   , result_seq_ (0)
   , caught_exception_ (0)
   , reply_status_ (-1)
@@ -179,6 +182,31 @@ TAO_ServerRequest::TAO_ServerRequest (TAO_ORB_Core * orb_core,
 
 TAO_ServerRequest::~TAO_ServerRequest (void)
 {
+#if TAO_HAS_INTERCEPTORS == 1
+  if (this->pi_current_copy_callback_)
+    {
+      TAO::ServerRequestInterceptor_Adapter *interceptor_adapter =
+        this->orb_core_->serverrequestinterceptor_adapter ();
+
+      if (interceptor_adapter)
+        {
+          interceptor_adapter->deallocate_pi_current_callback (
+            this->pi_current_copy_callback_);
+        }
+    }
+
+  if (this->rs_pi_current_)
+    {
+      TAO::ServerRequestInterceptor_Adapter *interceptor_adapter =
+        this->orb_core_->serverrequestinterceptor_adapter ();
+
+      if (interceptor_adapter)
+        {
+          interceptor_adapter->deallocate_pi_current (
+            this->rs_pi_current_);
+        }
+    }
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
 }
 
 CORBA::ORB_ptr
@@ -499,4 +527,39 @@ TAO_ServerRequest::caught_exception (CORBA::Exception *exception)
   this->caught_exception_ = exception;
 }
 
+TAO::PICurrent_Impl *
+TAO_ServerRequest::rs_pi_current (void)
+{
+  if (!this->rs_pi_current_)
+    {
+      TAO::ServerRequestInterceptor_Adapter *interceptor_adapter =
+        this->orb_core_->serverrequestinterceptor_adapter ();
+
+      if (interceptor_adapter)
+        {
+          this->rs_pi_current_ = interceptor_adapter->allocate_pi_current ();
+        }
+    }
+
+  return this->rs_pi_current_;
+}
+
+TAO::PICurrent_Copy_Callback *
+TAO_ServerRequest::pi_current_copy_callback (void)
+{
+  if (!this->pi_current_copy_callback_)
+    {
+      TAO::ServerRequestInterceptor_Adapter *interceptor_adapter =
+        this->orb_core_->serverrequestinterceptor_adapter ();
+
+      if (interceptor_adapter)
+        {
+          this->pi_current_copy_callback_ =
+            interceptor_adapter->allocate_pi_current_callback ();
+        }
+    }
+
+  return this->pi_current_copy_callback_;
+}
+
 #endif /*TAO_HAS_INTERCEPTORS*/
diff --git a/TAO/tao/TAO_Server_Request.h b/TAO/tao/TAO_Server_Request.h
index 5cf6c3b8758..288fd4a2723 100644
--- a/TAO/tao/TAO_Server_Request.h
+++ b/TAO/tao/TAO_Server_Request.h
@@ -31,8 +31,13 @@
 #include "Object.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
-#include "PICurrent_Impl.h"
-#include "PICurrent_Copy_Callback.h"
+namespace TAO
+{
+  class PICurrent;
+  class PICurrent_Impl;
+  class PICurrent_Copy_Callback;
+}
+#include "PortableInterceptorC.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 class TAO_Pluggable_Messaging;
@@ -238,10 +243,10 @@ public:
   size_t & interceptor_count (void);
 
   /// Return a reference to the "request scope" PICurrent object.
-  TAO::PICurrent_Impl & rs_pi_current (void);
+  TAO::PICurrent_Impl *rs_pi_current (void);
 
   /// Return a reference to the PICurrent copy callback object.
-  TAO::PICurrent_Copy_Callback & pi_current_copy_callback (void);
+  TAO::PICurrent_Copy_Callback *pi_current_copy_callback (void);
 
   CORBA::Exception *caught_exception (void);
 
@@ -331,11 +336,11 @@ private:
 
   /// The "Request Scope Current" (RSC) object, as required by
   /// Portable Interceptors.
-  TAO::PICurrent_Impl rs_pi_current_;
+  TAO::PICurrent_Impl *rs_pi_current_;
 
   /// PICurrent callback object responsible for copying slot table
   /// between PICurrents in different scopes (i.e. thread or request).
-  TAO::PICurrent_Copy_Callback pi_current_copy_callback_;
+  TAO::PICurrent_Copy_Callback *pi_current_copy_callback_;
 
   /// Used by the FTORB
   CORBA::OctetSeq_var result_seq_;
diff --git a/TAO/tao/TAO_Server_Request.i b/TAO/tao/TAO_Server_Request.i
index 1f9c0007cc9..a75efcab263 100644
--- a/TAO/tao/TAO_Server_Request.i
+++ b/TAO/tao/TAO_Server_Request.i
@@ -200,18 +200,6 @@ TAO_ServerRequest::interceptor_count (void)
   return this->interceptor_count_;
 }
 
-ACE_INLINE TAO::PICurrent_Impl &
-TAO_ServerRequest::rs_pi_current (void)
-{
-  return this->rs_pi_current_;
-}
-
-ACE_INLINE TAO::PICurrent_Copy_Callback &
-TAO_ServerRequest::pi_current_copy_callback (void)
-{
-  return this->pi_current_copy_callback_;
-}
-
 ACE_INLINE int
 TAO_ServerRequest::got_result (void)
 {
diff --git a/TAO/tao/TC_Constants_Forward.h b/TAO/tao/TC_Constants_Forward.h
deleted file mode 100644
index 72c27451a1c..00000000000
--- a/TAO/tao/TC_Constants_Forward.h
+++ /dev/null
@@ -1,110 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   TC_Constants_Forward.h
- *
- *  $Id$
- *
- *  Forward declare the type code constants used in the ORB.
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
-#ifndef TAO_TC_CONSTANTS_FORWARD_H
-#define TAO_TC_CONSTANTS_FORWARD_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TAO_Export.h"
-
-namespace CORBA
-{
-  /**
-   * @name TypeCode Constants
-   *
-   * All the TypeCode constants
-   */
-  //@{
-  extern TAO_Export TypeCode_ptr const _tc_null;
-  extern TAO_Export TypeCode_ptr const _tc_void;
-  extern TAO_Export TypeCode_ptr const _tc_short;
-  extern TAO_Export TypeCode_ptr const _tc_long;
-  extern TAO_Export TypeCode_ptr const _tc_ushort;
-  extern TAO_Export TypeCode_ptr const _tc_ulong;
-  extern TAO_Export TypeCode_ptr const _tc_float;
-  extern TAO_Export TypeCode_ptr const _tc_double;
-  extern TAO_Export TypeCode_ptr const _tc_boolean;
-  extern TAO_Export TypeCode_ptr const _tc_char;
-  extern TAO_Export TypeCode_ptr const _tc_octet;
-  extern TAO_Export TypeCode_ptr const _tc_any;
-  extern TAO_Export TypeCode_ptr const _tc_TypeCode;
-  extern TAO_Export TypeCode_ptr const _tc_Principal;
-  extern TAO_Export TypeCode_ptr const _tc_Object;
-  extern TAO_Export TypeCode_ptr const _tc_string;
-  extern TAO_Export TypeCode_ptr const _tc_longlong;
-  extern TAO_Export TypeCode_ptr const _tc_ulonglong;
-  extern TAO_Export TypeCode_ptr const _tc_longdouble;
-  extern TAO_Export TypeCode_ptr const _tc_wchar;
-  extern TAO_Export TypeCode_ptr const _tc_wstring;
-
-#define TAO_SYSTEM_EXCEPTION_LIST \
-  TAO_SYSTEM_EXCEPTION(UNKNOWN); \
-  TAO_SYSTEM_EXCEPTION(BAD_PARAM); \
-  TAO_SYSTEM_EXCEPTION(NO_MEMORY); \
-  TAO_SYSTEM_EXCEPTION(IMP_LIMIT); \
-  TAO_SYSTEM_EXCEPTION(COMM_FAILURE); \
-  TAO_SYSTEM_EXCEPTION(INV_OBJREF); \
-  TAO_SYSTEM_EXCEPTION(OBJECT_NOT_EXIST); \
-  TAO_SYSTEM_EXCEPTION(NO_PERMISSION); \
-  TAO_SYSTEM_EXCEPTION(INTERNAL); \
-  TAO_SYSTEM_EXCEPTION(MARSHAL); \
-  TAO_SYSTEM_EXCEPTION(INITIALIZE); \
-  TAO_SYSTEM_EXCEPTION(NO_IMPLEMENT); \
-  TAO_SYSTEM_EXCEPTION(BAD_TYPECODE); \
-  TAO_SYSTEM_EXCEPTION(BAD_OPERATION); \
-  TAO_SYSTEM_EXCEPTION(NO_RESOURCES); \
-  TAO_SYSTEM_EXCEPTION(NO_RESPONSE); \
-  TAO_SYSTEM_EXCEPTION(PERSIST_STORE); \
-  TAO_SYSTEM_EXCEPTION(BAD_INV_ORDER); \
-  TAO_SYSTEM_EXCEPTION(TRANSIENT); \
-  TAO_SYSTEM_EXCEPTION(FREE_MEM); \
-  TAO_SYSTEM_EXCEPTION(INV_IDENT); \
-  TAO_SYSTEM_EXCEPTION(INV_FLAG); \
-  TAO_SYSTEM_EXCEPTION(INTF_REPOS); \
-  TAO_SYSTEM_EXCEPTION(BAD_CONTEXT); \
-  TAO_SYSTEM_EXCEPTION(OBJ_ADAPTER); \
-  TAO_SYSTEM_EXCEPTION(DATA_CONVERSION); \
-  TAO_SYSTEM_EXCEPTION(INV_POLICY); \
-  TAO_SYSTEM_EXCEPTION(REBIND); \
-  TAO_SYSTEM_EXCEPTION(TIMEOUT); \
-  TAO_SYSTEM_EXCEPTION(TRANSACTION_UNAVAILABLE); \
-  TAO_SYSTEM_EXCEPTION(TRANSACTION_MODE); \
-  TAO_SYSTEM_EXCEPTION(TRANSACTION_REQUIRED); \
-  TAO_SYSTEM_EXCEPTION(TRANSACTION_ROLLEDBACK); \
-  TAO_SYSTEM_EXCEPTION(INVALID_TRANSACTION); \
-  TAO_SYSTEM_EXCEPTION(CODESET_INCOMPATIBLE); \
-  TAO_SYSTEM_EXCEPTION(BAD_QOS); \
-  TAO_SYSTEM_EXCEPTION(INVALID_ACTIVITY); \
-  TAO_SYSTEM_EXCEPTION(ACTIVITY_COMPLETED); \
-  TAO_SYSTEM_EXCEPTION(ACTIVITY_REQUIRED); \
-  TAO_SYSTEM_EXCEPTION(THREAD_CANCELLED);
-
-  // = Typecode constants for system exceptions.
-#define TAO_SYSTEM_EXCEPTION(name) \
-  extern TAO_Export TypeCode_ptr const _tc_ ## name
-  TAO_SYSTEM_EXCEPTION_LIST
-#undef  TAO_SYSTEM_EXCEPTION
-  //@}
-
-  extern TAO_Export TypeCode_ptr const _tc_UnknownUserException;
-
-  extern TAO_Export TypeCode_ptr const _tc_Current;
-
-  extern TAO_Export TypeCode_ptr const _tc_NamedValue;
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_TC_CONSTANTS_FORWARD_H */
diff --git a/TAO/tao/TSS_Resources.h b/TAO/tao/TSS_Resources.h
index 39fa2038898..49d73a60f63 100644
--- a/TAO/tao/TSS_Resources.h
+++ b/TAO/tao/TSS_Resources.h
@@ -105,12 +105,6 @@ public:
   TAO::GUIResource_Factory * gui_resource_factory_;
 };
 
-/**
- * @todo TAO_TSS_RESOURCES typedef should go away.  It is deprecated,
- *       and only exists for backward compatibility.
- */
-typedef TAO_TSS_Resources TAO_TSS_RESOURCES;
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_TSS_RESOURCES_H */
diff --git a/TAO/tao/TimeBaseA.cpp b/TAO/tao/TimeBaseA.cpp
deleted file mode 100644
index 93f2ddacf31..00000000000
--- a/TAO/tao/TimeBaseA.cpp
+++ /dev/null
@@ -1,271 +0,0 @@
-// -*- 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/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "TimeBaseC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/Recursive_Type_TypeCode.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_TimeBase_TimeT (
-    CORBA::tk_alias,
-    "IDL:omg.org/TimeBase/TimeT:1.0",
-    "TimeT",
-    &CORBA::_tc_ulonglong);
-  
-namespace TimeBase
-{
-  ::CORBA::TypeCode_ptr const _tc_TimeT =
-    &_tao_tc_TimeBase_TimeT;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_TimeBase_InaccuracyT (
-    CORBA::tk_alias,
-    "IDL:omg.org/TimeBase/InaccuracyT:1.0",
-    "InaccuracyT",
-    &TimeBase::_tc_TimeT);
-  
-namespace TimeBase
-{
-  ::CORBA::TypeCode_ptr const _tc_InaccuracyT =
-    &_tao_tc_TimeBase_InaccuracyT;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_TimeBase_TdfT (
-    CORBA::tk_alias,
-    "IDL:omg.org/TimeBase/TdfT:1.0",
-    "TdfT",
-    &CORBA::_tc_short);
-  
-namespace TimeBase
-{
-  ::CORBA::TypeCode_ptr const _tc_TdfT =
-    &_tao_tc_TimeBase_TdfT;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_TimeBase_UtcT[] =
-  {
-    { "time", &TimeBase::_tc_TimeT },
-    { "inacclo", &CORBA::_tc_ulong },
-    { "inacchi", &CORBA::_tc_ushort },
-    { "tdf", &TimeBase::_tc_TdfT }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_TimeBase_UtcT (
-    CORBA::tk_struct,
-    "IDL:omg.org/TimeBase/UtcT:1.0",
-    "UtcT",
-    _tao_fields_TimeBase_UtcT,
-    4);
-  
-namespace TimeBase
-{
-  ::CORBA::TypeCode_ptr const _tc_UtcT =
-    &_tao_tc_TimeBase_UtcT;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_TimeBase_IntervalT[] =
-  {
-    { "lower_bound", &TimeBase::_tc_TimeT },
-    { "upper_bound", &TimeBase::_tc_TimeT }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_TimeBase_IntervalT (
-    CORBA::tk_struct,
-    "IDL:omg.org/TimeBase/IntervalT:1.0",
-    "IntervalT",
-    _tao_fields_TimeBase_IntervalT,
-    2);
-  
-namespace TimeBase
-{
-  ::CORBA::TypeCode_ptr const _tc_IntervalT =
-    &_tao_tc_TimeBase_IntervalT;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const TimeBase::UtcT &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<TimeBase::UtcT>::insert_copy (
-      _tao_any,
-      TimeBase::UtcT::_tao_any_destructor,
-      TimeBase::_tc_UtcT,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    TimeBase::UtcT *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<TimeBase::UtcT>::insert (
-      _tao_any,
-      TimeBase::UtcT::_tao_any_destructor,
-      TimeBase::_tc_UtcT,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    TimeBase::UtcT *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const TimeBase::UtcT *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const TimeBase::UtcT *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<TimeBase::UtcT>::extract (
-        _tao_any,
-        TimeBase::UtcT::_tao_any_destructor,
-        TimeBase::_tc_UtcT,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const TimeBase::IntervalT &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<TimeBase::IntervalT>::insert_copy (
-      _tao_any,
-      TimeBase::IntervalT::_tao_any_destructor,
-      TimeBase::_tc_IntervalT,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    TimeBase::IntervalT *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<TimeBase::IntervalT>::insert (
-      _tao_any,
-      TimeBase::IntervalT::_tao_any_destructor,
-      TimeBase::_tc_IntervalT,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    TimeBase::IntervalT *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const TimeBase::IntervalT *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const TimeBase::IntervalT *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<TimeBase::IntervalT>::extract (
-        _tao_any,
-        TimeBase::IntervalT::_tao_any_destructor,
-        TimeBase::_tc_IntervalT,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/TimeBaseC.h b/TAO/tao/TimeBaseC.h
index d14e6e08e52..a5846a67720 100644
--- a/TAO/tao/TimeBaseC.h
+++ b/TAO/tao/TimeBaseC.h
@@ -64,105 +64,80 @@
 
 namespace TimeBase
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:379
-  
+
   typedef CORBA::ULongLong TimeT;
   typedef CORBA::ULongLong_out TimeT_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_TimeT;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:379
-  
+
   typedef TimeT InaccuracyT;
   typedef TimeT_out InaccuracyT_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_InaccuracyT;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:379
-  
+
   typedef CORBA::Short TdfT;
   typedef CORBA::Short_out TdfT_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_TdfT;
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct UtcT;
-  
+
   typedef
     TAO_Fixed_Var_T<
         UtcT
       >
     UtcT_var;
-  
+
   typedef
     UtcT &
     UtcT_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:52
-  
+
   struct TAO_Export UtcT
   {
     typedef UtcT_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     TimeBase::TimeT time;
     CORBA::ULong inacclo;
     CORBA::UShort inacchi;
     TimeBase::TdfT tdf;
   };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_UtcT;
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct IntervalT;
-  
+
   typedef
     TAO_Fixed_Var_T<
         IntervalT
       >
     IntervalT_var;
-  
+
   typedef
     IntervalT &
     IntervalT_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:52
-  
+
   struct TAO_Export IntervalT
   {
     typedef IntervalT_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     TimeBase::TimeT lower_bound;
     TimeBase::TimeT upper_bound;
   };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_IntervalT;
 
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:66
@@ -178,22 +153,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// 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
-// 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
 // be\be_visitor_structure/cdr_op_ch.cpp:54
 
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TimeBase::UtcT &);
diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp
index 17b7e2cad92..d1b70a2da54 100644
--- a/TAO/tao/Transport.cpp
+++ b/TAO/tao/Transport.cpp
@@ -822,7 +822,11 @@ TAO_Transport::drain_queue_i (void)
   // the loop because after the loop there may still be data to be
   // sent
   int iovcnt = 0;
+#if defined (ACE_INITIALIZE_MEMORY_BEFORE_USE)
+  iovec iov[ACE_IOV_MAX] = { 0 };
+#else
   iovec iov[ACE_IOV_MAX];
+#endif /* ACE_INITIALIZE_MEMORY_BEFORE_USE */
 
   // We loop over all the elements in the queue ...
   TAO_Queued_Message *i = this->head_;
@@ -1452,7 +1456,6 @@ TAO_Transport::parse_consolidate_messages (ACE_Message_Block &block,
   // Check whether we have a complete message for processing
   const ssize_t missing_data = this->missing_data (block);
 
-
   if (missing_data < 0)
     {
       // If we have more than one message
@@ -1501,7 +1504,7 @@ TAO_Transport::parse_incoming_messages (ACE_Message_Block &block)
 }
 
 
-size_t
+ssize_t
 TAO_Transport::missing_data (ACE_Message_Block &incoming)
 {
   // If we have a incomplete message in the queue then find out how
diff --git a/TAO/tao/Transport.h b/TAO/tao/Transport.h
index be7b5573629..e70f72e0a0b 100644
--- a/TAO/tao/Transport.h
+++ b/TAO/tao/Transport.h
@@ -647,7 +647,7 @@ protected:
   /// Return if we have any missing data in the queue of messages
   /// or determine if we have more information left out in the
   /// presently read message to make it complete.
-  size_t missing_data (ACE_Message_Block &message_block);
+  ssize_t missing_data (ACE_Message_Block &message_block);
 
   /// Consolidate the currently read message or consolidate the last
   /// message in the queue. The consolidation of the last message in
diff --git a/TAO/tao/True_RefCount_Policy.cpp b/TAO/tao/True_RefCount_Policy.cpp
deleted file mode 100644
index 3b5b3fab354..00000000000
--- a/TAO/tao/True_RefCount_Policy.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-// $Id$
-
-#include "True_RefCount_Policy.h"
-
-#ifndef  __ACE_INLINE__
-# include  "True_RefCount_Policy.inl"
-#endif  /* !__ACE_INLINE__ */
-
-
-ACE_RCSID (tao,
-           True_RefCount_Policy,
-           "$Id$")
-
-
-TAO::True_RefCount_Policy::~True_RefCount_Policy (void)
-{
-}
diff --git a/TAO/tao/True_RefCount_Policy.h b/TAO/tao/True_RefCount_Policy.h
deleted file mode 100644
index fb2ce06f2e6..00000000000
--- a/TAO/tao/True_RefCount_Policy.h
+++ /dev/null
@@ -1,116 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    True_RefCount_Policy.h
- *
- *  $Id$
- *
- *  Header file for TAO's true reference count policy (unrelated to
- *  CORBA policies).
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_TRUE_REFCOUNT_POLICY_H
-#define TAO_TRUE_REFCOUNT_POLICY_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TAO_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/orbconf.h"
-
-#include "ace/Thread_Mutex.h"
-#include "ace/Atomic_Op.h"
-
-namespace TAO
-{
-  /**
-   * @class True_RefCount_Policy
-   *
-   * @brief True reference counting policy.
-   *
-   * This class is intended to be used as a "policy" argument to a
-   * host class template that requires true/functional reference
-   * counting.  That class would then inherit privately from it like
-   * so:
-   *
-   * @code
-   *   template <class RefCountPolicy>
-   *   class MyHostClass : private RefCountPolicy
-   *   {
-   *   public:
-   *     void my_add_ref (void)    { this->RefCountPolicy::add_ref (); }
-   *     void my_remove_ref (void) { this->RefCountPolicy::remove_ref (); }
-   *   };
-   * @endcode
-   *
-   * and use it like so:
-   *
-   * @code
-   *   typedef MyHostClass<TAO::True_RefCount_Policy> MyRefCountedClass;
-   *   MyRefCountedClass * p = new MyRefCountedClass;
-   *   ...
-   *   p->my_remove_ref ();
-   * @endcode
-   *
-   * @note Ideally, the host class should declare a protected
-   *       destructor to enforce proper memory management through the
-   *       reference counting mechanism, i.e. to prevent clients from
-   *       calling @c operator @c delete() directly on the host class
-   *       object.
-   */
-  class TAO_Export True_RefCount_Policy
-  {
-  public:
-
-    /// Increase the reference count on this object.
-    void add_ref (void);
-
-    /// Decrease the reference count on this object.
-    /**
-     * Decrease the reference count on this object.  Once the
-     * reference count drops to zero, call @c operator @c delete()
-     * on this object.
-     */
-    void remove_ref (void);
-
-  protected:
-
-    /// Constructor.
-    /**
-     * @note This constructor is protected since it not meant to be
-     *       instantiated/used as a standalone object.
-     */
-    True_RefCount_Policy (void);
-
-    /// Destructor.
-    /**
-     * @note The destructor must be virtual to ensure that subclass
-     *       destructors are called when the reference count drops to
-     *       zero, i.e. when @c remove_ref() calls @c operator
-     *       @c delete @c this.
-     */
-    virtual ~True_RefCount_Policy (void);
-
-  private:
-    /// Reference counter.
-    ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_;
-  };
-
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/True_RefCount_Policy.inl"
-#endif  /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_TRUE_REFCOUNT_POLICY_H */
diff --git a/TAO/tao/True_RefCount_Policy.inl b/TAO/tao/True_RefCount_Policy.inl
deleted file mode 100644
index 87b1b1b9159..00000000000
--- a/TAO/tao/True_RefCount_Policy.inl
+++ /dev/null
@@ -1,25 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-
-ACE_INLINE
-TAO::True_RefCount_Policy::True_RefCount_Policy (void)
-  : refcount_ (1)
-{
-}
-
-ACE_INLINE void
-TAO::True_RefCount_Policy::add_ref (void)
-{
-  ++this->refcount_;
-}
-
-ACE_INLINE void
-TAO::True_RefCount_Policy::remove_ref (void)
-{
-  const unsigned long new_count = --this->refcount_;
-
-  if (new_count == 0)
-    delete this;
-}
diff --git a/TAO/tao/TypeCode.h b/TAO/tao/TypeCode.h
deleted file mode 100644
index 373104e4ca6..00000000000
--- a/TAO/tao/TypeCode.h
+++ /dev/null
@@ -1,580 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    TypeCode.h
- *
- *  $Id$
- *
- *  Header file the @c CORBA::TypeCode class.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- *  @author DOC group at Vanderbilt University, Washington University
- *          and the University of California at Irvine.
- */
-//=============================================================================
-
-#ifndef TAO_TYPECODE_H
-#define TAO_TYPECODE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TAO_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/UserException.h"
-#include "tao/Basic_Types.h"
-#include "tao/ValueModifierC.h"
-#include "tao/VisibilityC.h"
-#include "tao/Typecode_typesC.h"
-#include "tao/CORBA_methods.h"
-#include "tao/Pseudo_VarOut_T.h"
-#include "tao/Object_Argument_T.h"
-#include "tao/Arg_Traits_T.h"
-
-
-namespace CORBA
-{
-  typedef TAO_Pseudo_Var_T<TypeCode> TypeCode_var;
-  typedef TAO_Pseudo_Out_T<TypeCode, TypeCode_var> TypeCode_out;
-
-  /**
-   * @class TypeCode
-   *
-   * @brief A representation of the structure of a given OMG
-   *        IDL-declared type.
-   *
-   * @c TypeCodes are primarily used by @c CORBA::Anys, the CORBA
-   * Interface Repository and the CORBA Dynamic Invocation Interface.
-   */
-  class TAO_Export TypeCode
-  {
-  public:
-
-    /**
-     * @class Bounds
-     *
-     * @brief Out-of-bounds member index exception.
-     *
-     * Exception thrown when attempting to pass an out-of-bounds index
-     * value to a @c TypeCode operation that accepts a member index
-     * argument.
-     */
-    class TAO_Export Bounds : public UserException
-    {
-    public:
-
-      /// Constructor.
-      Bounds (void);
-
-      static Bounds * _downcast (CORBA::Exception * ex);
-      static CORBA::Exception * _alloc (void);
-
-      virtual CORBA::Exception * _tao_duplicate (void) const;
-
-      virtual void _raise (void) const;
-
-      virtual void _tao_encode (TAO_OutputCDR & cdr
-                                ACE_ENV_ARG_DECL) const;
-      virtual void _tao_decode (TAO_InputCDR & cdr
-                                ACE_ENV_ARG_DECL);
-
-    };
-
-    /**
-     * @class BadKind
-     *
-     * @brief Invalid @c TypeCode operation exception.
-     *
-     * Exception thrown when attempting to invoke a @c TypeCode
-     * operation that is not valid for the type represented by the
-     * @c TypeCode.
-     */
-    class TAO_Export BadKind : public CORBA::UserException
-    {
-    public:
-
-      BadKind (void);
-
-      static BadKind * _downcast (CORBA::Exception * ex);
-      static CORBA::Exception * _alloc (void);
-
-      virtual CORBA::Exception * _tao_duplicate (void) const;
-
-      virtual void _raise (void) const;
-
-      virtual void _tao_encode (TAO_OutputCDR & cdr
-                                ACE_ENV_ARG_DECL) const;
-      virtual void _tao_decode (TAO_InputCDR & cdr
-                                ACE_ENV_ARG_DECL);
-
-    };
-
-    static CORBA::TypeCode_ptr const _tc_Bounds;
-    static CORBA::TypeCode_ptr const _tc_BadKind;
-
-    /// Duplicate this @c TypeCode.
-    /**
-     * Statically instantiated @c TypeCodes incur no reference count
-     * manipulation, i.e. reference counting is a no-op.
-     *
-     * Dynamically instantiated @c TypeCodes will have their reference
-     * count incremented by one each time this function is called.
-     */
-    static CORBA::TypeCode_ptr _duplicate (CORBA::TypeCode_ptr tc);
-
-    /// Returns a NULL typecode.
-    static CORBA::TypeCode_ptr _nil (void);
-
-    /**
-     * @name @c CORBA::TypeCode Methods
-     *
-     * These methods are part of the public interface of @c
-     * CORBA::TypeCode class, as defined by the OMG CORBA
-     * specification and C++ mapping.
-     *
-     * The C++ mapping does not declare the methods in the public
-     * @c CORBA::TypeCode API as @c virtual, so work around that by
-     * making these methods inlined to forward all calls to the
-     * corresponding protected template method (i.e. the design
-     * pattern, not the C++ feature) listed below in the @c protected
-     * block.
-     */
-    //@{
-    /// Equality of two @c TypeCodes.
-    /**
-     * @return @c true if and only if the set of legal operations is
-     *         the same and invoking any operation on the this
-     *         @c TypeCode and @a tc returns identical results.
-     */
-    Boolean equal (TypeCode_ptr tc
-                   ACE_ENV_ARG_DECL) const;
-
-    /// Equivalence of two @c TypeCodes.
-    /**
-     * Equivalence of two @c TypeCodes satisfies a subset of the
-     * requirements necessary for equality.
-     *
-     * @see equal
-     */
-    Boolean equivalent (TypeCode_ptr tc
-                        ACE_ENV_ARG_DECL) const;
-
-    /// The kind of @c TypeCode.
-    TCKind kind (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    /// Return @c TypeCode stripped of optional @c name and
-    /// @c member_name fields.
-    /**
-     * @note Calling this method will incur additional run-time memory
-     *       consumption since TAO's implementation relies on the
-     *       TypeCodeFactory to dynamically create a compact @c
-     *       TypeCode; the exception being @c TypeCodes with empty
-     *       parameter lists.  Those @c TypeCodes are already compact,
-     *       meaning that call this method on such @c TypeCodes incurs
-     *       no additional run-time memory requirements.
-     *
-     *       Unless you need to send compact @c TypeCodes
-     *       "over-the-wire" or your @c TypeCode corresponds to a
-     *       type with a large number of members, try to stick with
-     *       the existing potentially non-compact @c TypeCode.
-     *
-     * @note Compact @c TypeCodes may also be generated statically by
-     *       the TAO_IDL compiler by invoking it with its "-Gt"
-     *       (i.e. enable optimized TypeCodes) command line option.
-     */
-    TypeCode_ptr get_compact_typecode (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    /// The @c RepositoryId globally identifying the type.
-    /**
-     * This method is valid for the following kinds of @c TypeCodes:
-     *
-     * @li @c tk_objref
-     * @li @c tk_struct
-     * @li @c tk_union
-     * @li @c tk_enum
-     * @li @c tk_alias
-     * @li @c tk_value
-     * @li @c tk_value_box
-     * @li @c tk_native
-     * @li @c tk_abstract_interface
-     * @li @c tk_local_interface
-     * @li @c tk_except
-     * @li @c tk_component
-     * @li @c tk_home
-     * @li @c tk_event
-     *
-     * @note CORBA::TypeCode::id() does not follow the usual parameter
-     *       passing rules defined by the C++ mapping.  This behavior
-     *       is required by the C++ mapping.  In particular, ownership
-     *       is maintained by the @c TypeCode.
-     */
-    char const * id (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    /// The simple name identifying the type within its enclosing
-    /// scope.
-    /**
-     * This method is valid for the following kinds of @c TypeCodes:
-     *
-     * @li @c tk_objref
-     * @li @c tk_struct
-     * @li @c tk_union
-     * @li @c tk_enum
-     * @li @c tk_alias
-     * @li @c tk_value
-     * @li @c tk_value_box
-     * @li @c tk_native
-     * @li @c tk_abstract_interface
-     * @li @c tk_local_interface
-     * @li @c tk_except
-     * @li @c tk_component
-     * @li @c tk_home
-     * @li @c tk_event
-     *
-     * @note CORBA::TypeCode::name() does not follow the usual
-     *       parameter passing rules defined by the C++ mapping.  This
-     *       behavior is required by the C++ mapping.  In particular,
-     *       ownership is maintained by the @c TypeCode.
-     */
-    char const * name (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    /// The type member count.
-    /**
-     * This method is valid for the following kinds of @c TypeCodes:
-     *
-     * @li @c tk_struct
-     * @li @c tk_union
-     * @li @c tk_enum
-     * @li @c tk_value
-     * @li @c tk_except
-     * @li @c tk_event
-     */
-    ULong member_count (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    /// The type member name.
-    /**
-     * This method is valid for the following kinds of @c TypeCodes:
-     *
-     * @li @c tk_struct
-     * @li @c tk_union
-     * @li @c tk_enum
-     * @li @c tk_value
-     * @li @c tk_except
-     * @li @c tk_event
-     *
-     * @note CORBA::TypeCode::member_name() does not follow the usual
-     *       parameter passing rules defined by the C++ mapping.  This
-     *       behavior is required by the C++ mapping.  In particular,
-     *       ownership is maintained by the @c TypeCode.
-     */
-    char const * member_name (ULong index
-                              ACE_ENV_ARG_DECL) const;
-
-    /// The type member @c TypeCode.
-    /**
-     * This method is valid for the following kinds of @c TypeCodes:
-     *
-     * @li @c tk_struct
-     * @li @c tk_union
-     * @li @c tk_value
-     * @li @c tk_except
-     * @li @c tk_event
-     */
-    TypeCode_ptr member_type (ULong index
-                              ACE_ENV_ARG_DECL) const;
-
-    /// The union member label.
-    /**
-     * This method is valid for the following kinds of @c TypeCodes:
-     *
-     * @li @c tk_union
-     */
-    Any * member_label (ULong index
-                        ACE_ENV_ARG_DECL) const;
-
-    /// The type of all non-default union member labels.
-    /**
-     * This method is valid for the following kinds of @c TypeCodes:
-     *
-     * @li @c tk_union
-     */
-    TypeCode_ptr discriminator_type (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    /// The index of the default union member.
-    /**
-     * This method is valid for the following kinds of @c TypeCodes:
-     *
-     * @li @c tk_union
-     */
-    Long default_index (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    /// The length of the type.
-    /**
-     * This method is valid for the following kinds of @c TypeCodes:
-     *
-     * @li @c tk_string
-     * @li @c tk_wstring
-     * @li @c tk_sequence
-     * @li @c tk_array
-     */
-    ULong length (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    /// The underlying content type.
-    /**
-     * This method is valid for the following kinds of @c TypeCodes:
-     *
-     * @li @c tk_sequence
-     * @li @c tk_array
-     * @li @c tk_value_box
-     * @li @c tk_alias
-     */
-    TypeCode_ptr content_type (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    /// The number of significant digits.
-    /**
-     * This method is valid for the following kinds of @c TypeCodes:
-     *
-     * @li @c tk_fixed
-     */
-    UShort fixed_digits (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    /// The scale factor.
-    /**
-     * This method is valid for the following kinds of @c TypeCodes:
-     *
-     * @li @c tk_fixed
-     */
-    UShort fixed_scale (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    /// The @c Visibility of the @c valuetype or @c eventtype member
-    /// corresponding to index @a index.
-    /**
-     * This method is valid for the following kinds of @c TypeCodes:
-     *
-     * @li @c tk_value
-     * @li @c tk_event
-     */
-    Visibility member_visibility (ULong index
-                                  ACE_ENV_ARG_DECL) const;
-
-    /// The @c ValueModifier of the @c valuetype of @c eventtype
-    /// represented by this @c TypeCode.
-    /**
-     * This method is valid for the following kinds of @c TypeCodes:
-     *
-     * @li @c tk_value
-     * @li @c tk_event
-     */
-    ValueModifier type_modifier (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    /// The @c TypeCode corresponding to the concrete base
-    /// @c valuetype or @c eventtype.
-    /**
-     * This method is valid for the following kinds of @c TypeCodes:
-     *
-     * @li @c tk_value
-     * @li @c tk_event
-     *
-     * @return @c TypeCode corresponding to the concrete base
-     *         @c valuetype or @c eventtype.
-     *         @c CORBA::TypeCode::_nil() if no concrete base exists.
-     */
-    TypeCode_ptr concrete_base_type (ACE_ENV_SINGLE_ARG_DECL) const;
-    //@}
-
-    /// Marshal the @c TypeCode @c TCKind.
-    /**
-     *
-     */
-    virtual bool tao_marshal_kind (TAO_OutputCDR & cdr) const;
-
-    /// Marshal this @c TypeCode into a CDR output stream.
-    /**
-     * Marshal this @c TypeCode into the @a cdr output CDR stream,
-     * excluding the @c TypeCode kind.  Existing @a cdr contents will
-     * not be altered.  The marshaled @c TypeCode will be appended to
-     * the given @a cdr CDR output stream.
-     *
-     * @param cdr    Output CDR stream into which the @c TypeCode will be
-     *               marshaled.
-     *
-     * @param offset Number of bytes currently in the output CDR
-     *               stream, including the top-level TypeCode @c
-     *               TCKind.  This argument is useful for recursive
-     *               @c TypeCodes.  @c TypeCodes that contain other
-     *               @c TypeCodes should pass an updated @a offset
-     *               value to the marshaling operation for those
-     *               contained @c TypeCodes.
-     *
-     * @return @c true if marshaling was successful.
-     *
-     * @note This is a TAO-specific method that is not part of the
-     *       standard @c CORBA::TypeCode interface.
-     *
-     * @note If this method returns @false, the contents of the @a cdr
-     *       output CDR stream are undefined.
-     */
-    virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                              CORBA::ULong offset) const = 0;
-
-    /// Increase the reference count on this @c TypeCode.
-    virtual void tao_duplicate (void) = 0;
-
-    /// Decrease the reference count on this object.
-    virtual void tao_release (void) = 0;
-
-    /// Destruction callback for Anys.
-    static void _tao_any_destructor (void * x);
-
-    typedef CORBA::TypeCode_var _var_type;
-
-  protected:
-
-    /// Constructor.
-    TypeCode (CORBA::TCKind kind);
-
-    /// Destructor.
-    /**
-     * Protected destructor to enforce proper memory management
-     * through the reference counting mechanism.
-     */
-    virtual ~TypeCode (void);
-
-    /**
-     * @name @c TypeCode Template Methods
-     *
-     * Methods that must be implemented by @c CORBA::TypeCode
-     * subclasses if valid for those subclasses.
-     *
-     * The default implementations of the non-pure virtual methods
-     * throw the @c CORBA::TypeCode::BadKind exception since many of
-     * these methods are @c TypeCode type-specific.  This reduces code
-     * duplication and bloat.
-     *
-     * The @c TypeCode @c equal(), @c equivalent(), @c kind() and
-     * @c get_compact_typecode() methods are valid for all
-     * @c TypeCodes which is why their template method "@c _i"
-     * counterparts are pure virtual.
-     */
-    //@{
-    virtual Boolean equal_i (TypeCode_ptr tc
-                             ACE_ENV_ARG_DECL) const = 0;
-    virtual Boolean equivalent_i (TypeCode_ptr tc
-                                  ACE_ENV_ARG_DECL) const = 0;
-    virtual TypeCode_ptr get_compact_typecode_i (
-      ACE_ENV_SINGLE_ARG_DECL) const = 0;
-
-    virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const;
-    virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const;
-    virtual ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const;
-    virtual char const * member_name_i (ULong index
-                                        ACE_ENV_ARG_DECL) const;
-    virtual TypeCode_ptr member_type_i (ULong index
-                                        ACE_ENV_ARG_DECL) const;
-    virtual Any * member_label_i (ULong index
-                                  ACE_ENV_ARG_DECL) const;
-    virtual TypeCode_ptr discriminator_type_i (
-      ACE_ENV_SINGLE_ARG_DECL) const;
-    virtual Long default_index_i (ACE_ENV_SINGLE_ARG_DECL) const;
-    virtual ULong length_i (ACE_ENV_SINGLE_ARG_DECL) const;
-    virtual TypeCode_ptr content_type_i (ACE_ENV_SINGLE_ARG_DECL) const;
-    virtual UShort fixed_digits_i (ACE_ENV_SINGLE_ARG_DECL) const;
-    virtual UShort fixed_scale_i (ACE_ENV_SINGLE_ARG_DECL) const;
-    virtual Visibility member_visibility_i (ULong index
-                                            ACE_ENV_ARG_DECL) const;
-    virtual ValueModifier type_modifier_i (ACE_ENV_SINGLE_ARG_DECL) const;
-    virtual TypeCode_ptr concrete_base_type_i (
-      ACE_ENV_SINGLE_ARG_DECL) const;
-    //@}
-
-  private:
-
-    // Prevent copying and assignment.
-    TypeCode (TypeCode const &);
-    void operator= (TypeCode const &);
-
-  protected:
-
-    /// The kind of TypeCode.
-    TCKind const kind_;
-
-  };
-
-}  // End namespace CORBA
-
-
-TAO_NAMESPACE_INLINE_FUNCTION
-bool operator<< (TAO_OutputCDR & cdr,
-                            CORBA::TypeCode_ptr tc);
-
-TAO_Export bool operator>> (TAO_InputCDR & cdr,
-                            CORBA::TypeCode_ptr & tc);
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    /// Marshal the @c TypeCode @a tc in to the output CDR stream @a
-    /// cdr.
-    /**
-     * @see @CORBA::TypeCode::tao_marshal() description for details.
-     */
-
-    TAO_Export bool marshal (TAO_OutputCDR & cdr,
-                             CORBA::TypeCode_ptr tc,
-                             CORBA::ULong offset);
-
-    /// Return @a offset aligned on the appropriate CDR boundary.
-    TAO_Export CORBA::ULong aligned_offset (CORBA::ULong offset);
-  }
-
-  /// Return the unaliased content @c TypeCode of the given
-  /// @c TypeCode.
-  TAO_Export CORBA::TypeCode_ptr unaliased_typecode (CORBA::TypeCode_ptr tc
-                                                     ACE_ENV_ARG_DECL);
-
-  /// Return the unaliased @c TCKind of the given @c TypeCode.
-  /**
-   * @note This is a convenience function that simply calls @c kind()
-   *       on the unaliased @c TypeCode returned from
-   *       @c unaliased_typecode().
-   */
-  TAO_NAMESPACE_INLINE_FUNCTION
-  CORBA::TCKind unaliased_kind (CORBA::TypeCode_ptr tc
-                                ACE_ENV_ARG_DECL);
-
-  // ---------------------------------------------------------------
-
-  // Used in generated code if CORBA::TypeCode is an argument or
-  // return type.
-  template<>
-  class TAO_Export Arg_Traits<CORBA::TypeCode>
-    : public Object_Arg_Traits_T<CORBA::TypeCode_ptr,
-                                 CORBA::TypeCode_var,
-                                 CORBA::TypeCode_out,
-                                 TAO::Objref_Traits<CORBA::TypeCode> >
-  {
-  };
-
-  template<>
-  struct TAO_Export Objref_Traits< ::CORBA::TypeCode>
-  {
-    static ::CORBA::TypeCode_ptr duplicate (::CORBA::TypeCode_ptr);
-    static void release (::CORBA::TypeCode_ptr);
-    static ::CORBA::TypeCode_ptr nil (void);
-    static CORBA::Boolean marshal (::CORBA::TypeCode_ptr p,
-                                   TAO_OutputCDR & cdr);
-  };
-}
-
-
-#if defined (__ACE_INLINE__)
-# include "tao/TypeCode.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_TYPECODE_H */
diff --git a/TAO/tao/TypeCode.inl b/TAO/tao/TypeCode.inl
deleted file mode 100644
index 4126fdb565c..00000000000
--- a/TAO/tao/TypeCode.inl
+++ /dev/null
@@ -1,183 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-
-#include "tao/CORBA_methods.h"
-#include "tao/Environment.h"
-
-
-ACE_INLINE CORBA::Boolean
-CORBA::is_nil (CORBA::TypeCode_ptr obj)
-{
-  return obj == 0;
-}
-
-ACE_INLINE void
-CORBA::release (CORBA::TypeCode_ptr obj)
-{
-  if (obj)
-    obj->tao_release ();
-}
-
-// --------------------------------------------------------------
-
-ACE_INLINE
-CORBA::TypeCode::TypeCode (CORBA::TCKind k)
-  : kind_ (k)
-{
-}
-
-ACE_INLINE CORBA::TypeCode_ptr
-CORBA::TypeCode::_duplicate (CORBA::TypeCode_ptr tc)
-{
-  if (!CORBA::is_nil (tc))
-    tc->tao_duplicate ();
-
-  return tc;
-}
-
-ACE_INLINE CORBA::TypeCode_ptr
-CORBA::TypeCode::_nil (void)
-{
-  return static_cast<CORBA::TypeCode_ptr> (0);
-}
-
-ACE_INLINE CORBA::TCKind
-CORBA::TypeCode::kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->kind_;
-}
-
-ACE_INLINE CORBA::TypeCode_ptr
-CORBA::TypeCode::get_compact_typecode (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  return this->get_compact_typecode_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-ACE_INLINE char const *
-CORBA::TypeCode::id (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  return this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-ACE_INLINE char const *
-CORBA::TypeCode::name (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  return this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-ACE_INLINE CORBA::ULong
-CORBA::TypeCode::member_count (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  return this->member_count_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-ACE_INLINE char const *
-CORBA::TypeCode::member_name (ULong index
-                              ACE_ENV_ARG_DECL) const
-{
-  return this->member_name_i (index
-                              ACE_ENV_ARG_PARAMETER);
-}
-
-ACE_INLINE CORBA::TypeCode_ptr
-CORBA::TypeCode::member_type (ULong index
-                              ACE_ENV_ARG_DECL) const
-{
-  return this->member_type_i (index
-                              ACE_ENV_ARG_PARAMETER);
-}
-
-ACE_INLINE CORBA::Any *
-CORBA::TypeCode::member_label (ULong index
-                               ACE_ENV_ARG_DECL) const
-{
-  return this->member_label_i (index
-                               ACE_ENV_ARG_PARAMETER);
-}
-
-ACE_INLINE CORBA::TypeCode_ptr
-CORBA::TypeCode::discriminator_type (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  return this->discriminator_type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-ACE_INLINE CORBA::Long
-CORBA::TypeCode::default_index (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  return this->default_index_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-ACE_INLINE CORBA::ULong
-CORBA::TypeCode::length (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  return this->length_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-ACE_INLINE CORBA::TypeCode_ptr
-CORBA::TypeCode::content_type (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  return this->content_type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-ACE_INLINE CORBA::UShort
-CORBA::TypeCode::fixed_digits (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  return this->fixed_digits_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-ACE_INLINE CORBA::UShort
-CORBA::TypeCode::fixed_scale (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  return this->fixed_scale_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-ACE_INLINE CORBA::Visibility
-CORBA::TypeCode::member_visibility (ULong index
-                                    ACE_ENV_ARG_DECL) const
-{
-  return this->member_visibility_i (index
-                                    ACE_ENV_ARG_PARAMETER);
-}
-
-ACE_INLINE CORBA::ValueModifier
-CORBA::TypeCode::type_modifier (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  return this->type_modifier_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-ACE_INLINE CORBA::TypeCode_ptr
-CORBA::TypeCode::concrete_base_type (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  return this->concrete_base_type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-ACE_INLINE void
-CORBA::TypeCode::_tao_any_destructor (void * x)
-{
-  CORBA::release (static_cast <CORBA::TypeCode_ptr> (x));
-}
-
-// --------------------------------------------------------------
-
-ACE_INLINE bool
-operator<< (TAO_OutputCDR & cdr,
-            CORBA::TypeCode_ptr tc)
-{
-  return TAO::TypeCode::marshal (cdr, tc, 0);
-}
-
-// ---------------------------------------------------------------
-
-ACE_INLINE CORBA::TCKind
-TAO::unaliased_kind (CORBA::TypeCode_ptr tc
-                     ACE_ENV_ARG_DECL)
-{
-  CORBA::TypeCode_var unaliased_tc =
-    TAO::unaliased_typecode (tc
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TAO_TC_KIND_COUNT);
-
-  return unaliased_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
diff --git a/TAO/tao/TypeCodeA.cpp b/TAO/tao/TypeCodeA.cpp
deleted file mode 100644
index 6ff09fdf2cc..00000000000
--- a/TAO/tao/TypeCodeA.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-// $Id$
-
-#include "Struct_TypeCode_Static.h"
-#include "Null_RefCount_Policy.h"
-
-
-ACE_RCSID (tao,
-           TypeCode,
-           "$Id$")
-
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    // Notice that these are all statically instantiated and not
-    // exported.
-
-    char const tc_bounds_id[]   = "IDL:omg.org/CORBA/TypeCode/Bounds:1.0";
-    char const tc_bounds_name[] = "Bounds";
-    Struct<char const *,
-           CORBA::TypeCode_ptr const *,
-           Struct_Field<char const *,
-                        CORBA::TypeCode_ptr const *> const *,
-           TAO::Null_RefCount_Policy> tc_Bounds (CORBA::tk_except,
-                                                 tc_bounds_id,
-                                                 tc_bounds_name,
-                                                 0,
-                                                 0);
-
-    char const tc_bad_kind_id[]   = "IDL:omg.org/CORBA/TypeCode/BadKind:1.0";
-    char const tc_bad_kind_name[] = "BadKind";
-    Struct<char const *,
-           CORBA::TypeCode_ptr const *,
-           Struct_Field<char const *,
-                        CORBA::TypeCode_ptr const *> const *,
-           TAO::Null_RefCount_Policy> tc_BadKind (CORBA::tk_except,
-                                                  tc_bad_kind_id,
-                                                  tc_bad_kind_name,
-                                                  0,
-                                                  0);
-  }
-}
-
-
-// ------------------------------------------------------------------
-// OMG defined TypeCode constants
-// ------------------------------------------------------------------
-
-// Notice that these are constant TypeCode references/pointers, not
-// constant TypeCodes.  TypeCodes are effectively read-only since
-// all non-static TypeCode operations are const.
-
-
-CORBA::TypeCode_ptr const CORBA::TypeCode::_tc_BadKind =
-  &TAO::TypeCode::tc_BadKind;
-CORBA::TypeCode_ptr const CORBA::TypeCode::_tc_Bounds =
-  &TAO::TypeCode::tc_Bounds;
-
diff --git a/TAO/tao/TypeCodeFactory.mpc b/TAO/tao/TypeCodeFactory.mpc
index 2b4b00c59bb..d84aece5bf6 100644
--- a/TAO/tao/TypeCodeFactory.mpc
+++ b/TAO/tao/TypeCodeFactory.mpc
@@ -27,6 +27,9 @@ project : taolib, core, ifr_client {
     TypeCodeFactory
   }
 
+  IDL_Files {
+  }
+
   Pkgconfig_Files {
     TypeCodeFactory/TAO_TypeCodeFactory.pc.in
   }
diff --git a/TAO/tao/TypeCodeFactory/Recursive_TypeCode.h b/TAO/tao/TypeCodeFactory/Recursive_TypeCode.h
index d9ca30b3758..1636cb666ad 100644
--- a/TAO/tao/TypeCodeFactory/Recursive_TypeCode.h
+++ b/TAO/tao/TypeCodeFactory/Recursive_TypeCode.h
@@ -17,8 +17,8 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/TypeCode.h"
-#include "tao/True_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/AnyTypeCode/True_RefCount_Policy.h"
 
 namespace TAO
 {
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryA.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactoryA.cpp
index 4111fe39297..0952ee4202b 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryA.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryA.cpp
@@ -26,14 +26,14 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "TypeCodeFactoryC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/objref_typecode.cpp:76
@@ -44,7 +44,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/CORBA/TypeCodeFactory:1.0",
     "TypeCodeFactory");
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_TypeCodeFactory =
@@ -77,7 +77,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<CORBA::TypeCodeFactory>::demarshal_value (TAO_InputCDR &)
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h
index e5f114a4261..1de9b8c30c0 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h
@@ -45,8 +45,8 @@
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
-#include "tao/TypeCode.h"
-#include "tao/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/Objref_VarOut_T.h"
 
 #include "tao/IFR_Client/IFR_ExtendedC.h"
@@ -70,22 +70,22 @@
 
 namespace CORBA
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_TYPECODEFACTORY__VAR_OUT_CH_)
 #define _CORBA_TYPECODEFACTORY__VAR_OUT_CH_
-  
+
   class TypeCodeFactory;
   typedef TypeCodeFactory *TypeCodeFactory_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         TypeCodeFactory
       >
     TypeCodeFactory_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         TypeCodeFactory
@@ -93,45 +93,45 @@ namespace CORBA
     TypeCodeFactory_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_TYPECODEFACTORY_CH_)
 #define _CORBA_TYPECODEFACTORY_CH_
-  
+
   class TAO_TypeCodeFactory_Export TypeCodeFactory
     : public virtual CORBA::Object
   {
   public:
     typedef TypeCodeFactory_ptr _ptr_type;
     typedef TypeCodeFactory_var _var_type;
-    
+
     // The static operations.
     static TypeCodeFactory_ptr _duplicate (TypeCodeFactory_ptr obj);
-    
+
     static void _tao_release (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 static_cast<TypeCodeFactory_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr create_struct_tc (
         const char * id,
         const char * name,
@@ -141,10 +141,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr create_union_tc (
         const char * id,
         const char * name,
@@ -155,10 +155,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr create_enum_tc (
         const char * id,
         const char * name,
@@ -168,10 +168,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr create_alias_tc (
         const char * id,
         const char * name,
@@ -181,10 +181,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr create_exception_tc (
         const char * id,
         const char * name,
@@ -194,10 +194,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr create_interface_tc (
         const char * id,
         const char * name
@@ -206,10 +206,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr create_string_tc (
         ::CORBA::ULong bound
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -217,10 +217,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr create_wstring_tc (
         ::CORBA::ULong bound
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -228,10 +228,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr create_fixed_tc (
         ::CORBA::UShort digits,
         ::CORBA::UShort scale
@@ -240,10 +240,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr create_sequence_tc (
         ::CORBA::ULong bound,
         ::CORBA::TypeCode_ptr element_type
@@ -252,10 +252,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr create_array_tc (
         ::CORBA::ULong length,
         ::CORBA::TypeCode_ptr element_type
@@ -264,10 +264,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr create_value_tc (
         const char * id,
         const char * name,
@@ -279,10 +279,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr create_value_box_tc (
         const char * id,
         const char * name,
@@ -292,10 +292,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr create_native_tc (
         const char * id,
         const char * name
@@ -304,10 +304,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr create_recursive_tc (
         const char * id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -315,10 +315,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr create_abstract_interface_tc (
         const char * id,
         const char * name
@@ -327,10 +327,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr create_local_interface_tc (
         const char * id,
         const char * name
@@ -339,10 +339,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr create_component_tc (
         const char * id,
         const char * name
@@ -351,10 +351,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr create_home_tc (
         const char * id,
         const char * name
@@ -363,10 +363,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr create_event_tc (
         const char * id,
         const char * name,
@@ -378,36 +378,36 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     TypeCodeFactory (void);
-    
+
     virtual ~TypeCodeFactory (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     TypeCodeFactory (const TypeCodeFactory &);
-    
+
     void operator= (const TypeCodeFactory &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   extern TAO_TypeCodeFactory_Export ::CORBA::TypeCode_ptr const _tc_TypeCodeFactory;
 
 // TAO_IDL - Generated from
@@ -424,7 +424,7 @@ namespace TAO
 
 #if !defined (_CORBA_TYPECODEFACTORY__TRAITS_CH_)
 #define _CORBA_TYPECODEFACTORY__TRAITS_CH_
-  
+
   template<>
   struct TAO_TypeCodeFactory_Export Objref_Traits< ::CORBA::TypeCodeFactory>
   {
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
index 02772abddb2..dcbfab24c9e 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
@@ -4,29 +4,29 @@
 #include "Recursive_TypeCode.h"
 
 #include "tao/IFR_Client/IFR_BasicC.h"
-#include "tao/Marshal.h"
+#include "tao/AnyTypeCode/Marshal.h"
 #include "tao/ORB_Constants.h"
 #include "tao/CDR.h"
-#include "tao/Any_Unknown_IDL_Type.h"
+#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/SystemException.h"
 
-#include "tao/Alias_TypeCode.h"
-#include "tao/Enum_TypeCode.h"
-#include "tao/Fixed_TypeCode.h"
-#include "tao/Objref_TypeCode.h"
-#include "tao/Sequence_TypeCode.h"
-#include "tao/String_TypeCode.h"
-#include "tao/Struct_TypeCode.h"
-#include "tao/Union_TypeCode.h"
-#include "tao/Value_TypeCode.h"
+#include "tao/AnyTypeCode/Alias_TypeCode.h"
+#include "tao/AnyTypeCode/Enum_TypeCode.h"
+#include "tao/AnyTypeCode/Fixed_TypeCode.h"
+#include "tao/AnyTypeCode/Objref_TypeCode.h"
+#include "tao/AnyTypeCode/Sequence_TypeCode.h"
+#include "tao/AnyTypeCode/String_TypeCode.h"
+#include "tao/AnyTypeCode/Struct_TypeCode.h"
+#include "tao/AnyTypeCode/Union_TypeCode.h"
+#include "tao/AnyTypeCode/Value_TypeCode.h"
 
-#include "tao/Recursive_Type_TypeCode.h"
+#include "tao/AnyTypeCode/Recursive_Type_TypeCode.h"
 
-#include "tao/TypeCode_Case_T.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/TypeCode_Value_Field.h"
+#include "tao/AnyTypeCode/TypeCode_Case_T.h"
+#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
+#include "tao/AnyTypeCode/TypeCode_Value_Field.h"
 
-#include "tao/True_RefCount_Policy.h"
+#include "tao/AnyTypeCode/True_RefCount_Policy.h"
 
 
 #include "ace/SString.h"
diff --git a/TAO/tao/TypeCodeFactory_Adapter.cpp b/TAO/tao/TypeCodeFactory_Adapter.cpp
index da87219834c..1dbec9f2dea 100644
--- a/TAO/tao/TypeCodeFactory_Adapter.cpp
+++ b/TAO/tao/TypeCodeFactory_Adapter.cpp
@@ -4,22 +4,11 @@
 
 #include "ace/Dynamic_Service.h"
 
-ACE_RCSID (tao, 
-           TypeCodeFactory_Adapter, 
+ACE_RCSID (tao,
+           TypeCodeFactory_Adapter,
            "$Id$")
 
 TAO_TypeCodeFactory_Adapter::~TAO_TypeCodeFactory_Adapter (void)
 {
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-
diff --git a/TAO/tao/TypeCodeFactory_Adapter.h b/TAO/tao/TypeCodeFactory_Adapter.h
index 2b266ba61c0..1e6e09eb1ff 100644
--- a/TAO/tao/TypeCodeFactory_Adapter.h
+++ b/TAO/tao/TypeCodeFactory_Adapter.h
@@ -22,10 +22,8 @@
 
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
-#include "tao/ValueModifierC.h"
 #include "tao/Typecode_typesC.h"
 
-
 template<class T> class ACE_Array_Base;
 
 namespace CORBA
@@ -37,6 +35,8 @@ namespace CORBA
 
   typedef TAO_Pseudo_Var_T<TypeCode> TypeCode_var;
   typedef TAO_Pseudo_Out_T<TypeCode, TypeCode_var> TypeCode_out;
+
+  typedef CORBA::Short ValueModifier;
 }
 
 namespace TAO
diff --git a/TAO/tao/TypeCode_Base_Attributes.cpp b/TAO/tao/TypeCode_Base_Attributes.cpp
deleted file mode 100644
index 9a8728a12e8..00000000000
--- a/TAO/tao/TypeCode_Base_Attributes.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-// $Id$
-
-#ifndef TAO_TYPECODE_BASE_ATTRIBUTES_CPP
-#define TAO_TYPECODE_BASE_ATTRIBUTES_CPP
-
-#include "tao/TypeCode_Base_Attributes.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/TypeCode_Base_Attributes.inl"
-#endif /* !__ACE_INLINE__ */
-
-#endif  /* TAO_TYPECODE_BASE_ATTRIBUTES_CPP */
diff --git a/TAO/tao/TypeCode_Base_Attributes.h b/TAO/tao/TypeCode_Base_Attributes.h
deleted file mode 100644
index 797c4373f47..00000000000
--- a/TAO/tao/TypeCode_Base_Attributes.h
+++ /dev/null
@@ -1,96 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    TypeCode_Base_Attributes.h
- *
- *  $Id$
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_TYPECODE_BASE_ATTRIBUTES_H
-#define TAO_TYPECODE_BASE_ATTRIBUTES_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-
-    /**
-     * @class Base_Attributes
-     *
-     * @brief Attributes contained by most @c TypeCodes with complex
-     *        parameter lists.
-     *
-     * Most @c TypeCodes with complex parameter lists (see Section
-     * 15.3.5.1 "TypeCode" in the CORBA specification) contain these
-     * attributes, namely a repository ID and a name.
-     */
-    template <typename STRING_TYPE>
-    class Base_Attributes
-    {
-    public:
-
-      /// Constructor.
-      Base_Attributes (char const * id,
-                       char const * name);
-
-      /// Constructor used by recursive @c TypeCodes.
-      Base_Attributes (char const * id);
-
-      /// Get the @c RepositoryId globally identifying the type.
-      char const * id (void) const;
-
-      /// Get the simple name identifying the type within its
-      /// enclosing scope.
-      char const * name (void) const;
-
-      /// Set the simple name identifying the type within its
-      /// enclosing scope.
-      /**
-       * @note This method only used when creating a recursive
-       *       TypeCode.
-       */
-      void name (char const * the_name);
-
-    private:
-
-      /// The @c RepositoryId globally identifying the type.
-      STRING_TYPE const id_;
-
-      /// The simple name identifying the type within its enclosing
-      /// scope.
-      STRING_TYPE name_;
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/TypeCode_Base_Attributes.inl"
-#endif /* __ACE_INLINE__ */
-
-#ifdef ACE_TEMPLATES_REQUIRE_SOURCE
-# include "tao/TypeCode_Base_Attributes.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
-# pragma implementation ("TypeCode_Base_Attributes.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_TYPECODE_BASE_ATTRIBUTES_H */
diff --git a/TAO/tao/TypeCode_Base_Attributes.inl b/TAO/tao/TypeCode_Base_Attributes.inl
deleted file mode 100644
index 0582fb7352f..00000000000
--- a/TAO/tao/TypeCode_Base_Attributes.inl
+++ /dev/null
@@ -1,51 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#include "tao/TypeCode_Traits.h"
-
-
-template <typename STRING_TYPE>
-ACE_INLINE
-TAO::TypeCode::Base_Attributes<STRING_TYPE>::Base_Attributes (
-  char const * id,
-  char const * name)
-  : id_ (id),
-    name_ (name)
-{
-}
-
-template <typename STRING_TYPE>
-ACE_INLINE
-TAO::TypeCode::Base_Attributes<STRING_TYPE>::Base_Attributes (
-  char const * id)
-  : id_ (id),
-    name_ ()
-{
-  // Only used in the dynamic (when STRING_TYPE == CORBA::String_var)
-  // recursive TypeCode case.
-}
-
-template <typename STRING_TYPE>
-ACE_INLINE char const *
-TAO::TypeCode::Base_Attributes<STRING_TYPE>::id (void) const
-{
-  return Traits<STRING_TYPE>::get_string (this->id_);
-}
-
-template <typename STRING_TYPE>
-ACE_INLINE char const *
-TAO::TypeCode::Base_Attributes<STRING_TYPE>::name (void) const
-{
-  return Traits<STRING_TYPE>::get_string (this->name_);
-}
-
-template <typename STRING_TYPE>
-ACE_INLINE void
-TAO::TypeCode::Base_Attributes<STRING_TYPE>::name (char const * the_name)
-{
-  // This method will only be instantiated in the dynamic TypeCode
-  // case, i.e. when STRING_TYPE is CORBA::String_var.
-
-  this->name_ = the_name;
-}
diff --git a/TAO/tao/TypeCode_CDR_Extraction.cpp b/TAO/tao/TypeCode_CDR_Extraction.cpp
deleted file mode 100644
index 4ce1faadfb3..00000000000
--- a/TAO/tao/TypeCode_CDR_Extraction.cpp
+++ /dev/null
@@ -1,1325 +0,0 @@
-// $Id$
-
-#include "TypeCode_CDR_Extraction.h"
-
-#include "tao/CDR.h"
-
-#include "tao/TypeCode_Constants.h"
-#include "tao/True_RefCount_Policy.h"
-
-#include "tao/Alias_TypeCode.h"
-#include "tao/Enum_TypeCode.h"
-#include "tao/Fixed_TypeCode.h"
-#include "Objref_TypeCode.h"
-#include "tao/Sequence_TypeCode.h"
-#include "tao/String_TypeCode.h"
-#include "tao/Struct_TypeCode.h"
-#include "tao/Union_TypeCode.h"
-#include "tao/Value_TypeCode.h"
-
-#include "tao/Recursive_Type_TypeCode.h"
-
-#include "tao/TypeCode_Case_T.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/TypeCode_Value_Field.h"
-
-#include "ace/Array_Base.h"
-
-
-ACE_RCSID (tao,
-           TypeCode_CDR_Extraction,
-           "$Id$")
-
-
-namespace TAO
-{
-  namespace TypeCodeFactory
-  {
-    // An array of TC_Info objects is used instead of a map of
-    // repository IDs to TypeCodes since it is presumed that the
-    // number of directly or indirectly embedded types in a TypeCode
-    // capable of holding another TypeCode will be small enough to
-    // make traversing a list faster than performing a map lookup.
-    // Use a simple array also reduces static and run-time footprint.
-
-    struct TC_Info
-    {
-      /// Constructor.
-      TC_Info (void) : id (0), type () {}
-
-      /// Repository ID.
-      char const * id;
-
-      /// TypeCode
-      CORBA::TypeCode_ptr type;
-    };
-
-    typedef ACE_Array_Base<TC_Info> TC_Info_List;
-  }
-}
-
-namespace
-{
-  bool start_cdr_encap_extraction (TAO_InputCDR & cdr)
-  {
-    CORBA::Boolean byte_order;
-
-    // Don't bother demarshaling the encapsulation length.  Prefer
-    // speed over early error checking.  Any CDR length related
-    // failures will be detected when demarshaling the remainder of
-    // the complex parameter list TypeCode.
-
-    if (!(cdr.skip_ulong () // Skip encapsulation length.
-          && cdr >> TAO_InputCDR::to_boolean (byte_order)))
-      return false;
-
-    cdr.reset_byte_order (byte_order);
-
-    return true;
-  }
-
-  // ---------------------------------------------------------
-
-  CORBA::ULong const TYPECODE_INDIRECTION = 0xffffffff;
-
-  // ---------------------------------------------------------
-
-  // Use an ACE::Value_Ptr to provide exception safety and proper
-  // copying semantics.
-  typedef ACE::Value_Ptr<TAO::TypeCode::Case<CORBA::String_var, CORBA::TypeCode_var> > union_elem_type;
-  typedef ACE_Array_Base<union_elem_type> union_case_array_type;
-
-  // ------------------------------------------------------------
-
-  /// Demarshal a TypeCode.
-  bool tc_demarshal (TAO_InputCDR & cdr,
-                     CORBA::TypeCode_ptr & tc,
-                     TAO::TypeCodeFactory::TC_Info_List & infos);
-
-  /// Demarshal an indirected TypeCode.
-  bool tc_demarshal_indirection (TAO_InputCDR & cdr,
-                                 CORBA::TypeCode_ptr & tc,
-                                 TAO::TypeCodeFactory::TC_Info_List & infos);
-
-  bool find_recursive_tc (char const * id,
-                          CORBA::TypeCode_ptr & tc,
-                          TAO::TypeCodeFactory::TC_Info_List & infos)
-  {
-    // See comments above for rationale behind using an array instead
-    // of a map.
-
-    size_t const len = infos.size ();
-
-    for (size_t i = 0; i < len; ++i)
-      {
-        TAO::TypeCodeFactory::TC_Info & info = infos[i];
-
-        if (ACE_OS::strcmp (info.id, id) == 0)
-          {
-            tc = info.type;
-            return true;
-          }
-      }
-
-    return false;
-  }
-}
-
-bool
-TAO::TypeCodeFactory::tc_null_factory (CORBA::TCKind,
-                                       TAO_InputCDR &,
-                                       CORBA::TypeCode_ptr & tc,
-                                       TC_Info_List &)
-{
-  tc = CORBA::TypeCode::_duplicate (CORBA::_tc_null);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_void_factory (CORBA::TCKind,
-                                       TAO_InputCDR &,
-                                       CORBA::TypeCode_ptr & tc,
-                                       TC_Info_List &)
-{
-  tc = CORBA::TypeCode::_duplicate (CORBA::_tc_void);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_short_factory (CORBA::TCKind,
-                                        TAO_InputCDR &,
-                                        CORBA::TypeCode_ptr & tc,
-                                        TC_Info_List &)
-{
-  tc = CORBA::TypeCode::_duplicate (CORBA::_tc_short);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_long_factory (CORBA::TCKind,
-                                       TAO_InputCDR &,
-                                       CORBA::TypeCode_ptr & tc,
-                                       TC_Info_List &)
-{
-  tc = CORBA::TypeCode::_duplicate (CORBA::_tc_long);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_ushort_factory (CORBA::TCKind,
-                                         TAO_InputCDR &,
-                                         CORBA::TypeCode_ptr & tc,
-                                         TC_Info_List &)
-{
-  tc = CORBA::TypeCode::_duplicate (CORBA::_tc_ushort);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_ulong_factory (CORBA::TCKind,
-                                        TAO_InputCDR &,
-                                        CORBA::TypeCode_ptr & tc,
-                                        TC_Info_List &)
-{
-  tc = CORBA::TypeCode::_duplicate (CORBA::_tc_ulong);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_float_factory (CORBA::TCKind,
-                                        TAO_InputCDR &,
-                                        CORBA::TypeCode_ptr & tc,
-                                        TC_Info_List &)
-{
-  tc = CORBA::TypeCode::_duplicate (CORBA::_tc_float);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_double_factory (CORBA::TCKind,
-                                         TAO_InputCDR &,
-                                         CORBA::TypeCode_ptr & tc,
-                                         TC_Info_List &)
-{
-  tc = CORBA::TypeCode::_duplicate (CORBA::_tc_double);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_boolean_factory (CORBA::TCKind,
-                                          TAO_InputCDR &,
-                                          CORBA::TypeCode_ptr & tc,
-                                          TC_Info_List &)
-{
-  tc = CORBA::TypeCode::_duplicate (CORBA::_tc_boolean);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_char_factory (CORBA::TCKind,
-                                       TAO_InputCDR &,
-                                       CORBA::TypeCode_ptr & tc,
-                                       TC_Info_List &)
-{
-  tc = CORBA::TypeCode::_duplicate (CORBA::_tc_char);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_octet_factory (CORBA::TCKind,
-                                        TAO_InputCDR &,
-                                        CORBA::TypeCode_ptr & tc,
-                                        TC_Info_List &)
-{
-  tc = CORBA::TypeCode::_duplicate (CORBA::_tc_octet);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_any_factory (CORBA::TCKind,
-                                      TAO_InputCDR &,
-                                      CORBA::TypeCode_ptr & tc,
-                                      TC_Info_List &)
-{
-  tc = CORBA::TypeCode::_duplicate (CORBA::_tc_any);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_TypeCode_factory (CORBA::TCKind,
-                                           TAO_InputCDR &,
-                                           CORBA::TypeCode_ptr & tc,
-                                           TC_Info_List &)
-{
-  tc = CORBA::TypeCode::_duplicate (CORBA::_tc_TypeCode);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_Principal_factory (CORBA::TCKind,
-                                            TAO_InputCDR &,
-                                            CORBA::TypeCode_ptr & tc,
-                                            TC_Info_List &)
-{
-  tc = CORBA::TypeCode::_duplicate (CORBA::_tc_Principal);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_objref_factory (CORBA::TCKind kind,
-                                         TAO_InputCDR & cdr,
-                                         CORBA::TypeCode_ptr & tc,
-                                         TC_Info_List &)
-{
-  // The remainder of a tk_objref TypeCode is encoded in a CDR
-  // encapsulation.
-  if (!start_cdr_encap_extraction (cdr))
-    return false;
-
-  // Extract the repository ID and name.
-  CORBA::String_var id;
-  if (!(cdr >> TAO_InputCDR::to_string (id.out (), 0)))
-    return false;
-
-  static char const Object_id[]    = "IDL:omg.org/CORBA/Object:1.0";
-  static char const CCMObject_id[] = "IDL:omg.org/CORBA/CCMObject:1.0";
-  static char const CCMHome_id[]   = "IDL:omg.org/CORBA/CCMHome:1.0";
-
-  char const * tc_constant_id = "";
-
-  switch (kind)
-    {
-    case CORBA::tk_component:
-      tc_constant_id = CCMObject_id;
-      break;
-    case CORBA::tk_home:
-      tc_constant_id = CCMHome_id;
-      break;
-    case CORBA::tk_objref:
-      tc_constant_id = Object_id;
-      break;
-    default:
-      break;
-    }
-
-  if (ACE_OS::strcmp (id.in (),  // len >= 0!!!
-                      tc_constant_id) == 0)
-    {
-      if (!cdr.skip_string ())  // No need to demarshal the name.
-        return false;
-
-      CORBA::TypeCode_ptr tc_constant = CORBA::TypeCode::_nil ();
-      switch (kind)
-        {
-        case CORBA::tk_component:
-          tc_constant = CORBA::_tc_Component;
-          break;
-        case CORBA::tk_home:
-          tc_constant = CORBA::_tc_Home;
-          break;
-        case CORBA::tk_objref:
-          tc_constant = CORBA::_tc_Object;
-          break;
-        default:
-          break;
-        }
-
-      // No need to create a TypeCode.  Just use the TypeCode
-      // constant.
-      tc =
-        CORBA::TypeCode::_duplicate (tc_constant);
-    }
-  else
-    {
-      CORBA::String_var name;
-
-      if (!(cdr >> TAO_InputCDR::to_string (name.out (), 0)))
-        return false;
-
-      typedef TAO::TypeCode::Objref<CORBA::String_var,
-                                    TAO::True_RefCount_Policy> typecode_type;
-
-      ACE_NEW_RETURN (tc,
-                      typecode_type (kind,
-                                     id.in (),
-                                     name.in ()),
-                      false);
-    }
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_struct_factory (CORBA::TCKind kind,
-                                         TAO_InputCDR & cdr,
-                                         CORBA::TypeCode_ptr & tc,
-                                         TC_Info_List & infos)
-{
-  ACE_ASSERT (kind == CORBA::tk_struct || kind == CORBA::tk_except);
-
-  // The remainder of a tk_struct/tk_except TypeCode is encoded in
-  // a CDR encapsulation.
-  if (!start_cdr_encap_extraction (cdr))
-    return false;
-
-  // Extract the repository ID, name and number of fields.
-  CORBA::String_var id, name;
-  CORBA::ULong nfields;
-
-  if (!(cdr >> TAO_InputCDR::to_string (id.out (), 0)
-        && cdr >> TAO_InputCDR::to_string (name.out (), 0)
-        && cdr >> nfields))
-    return false;
-
-  typedef ACE_Array_Base<TAO::TypeCode::Struct_Field<CORBA::String_var,
-                                                     CORBA::TypeCode_var> >
-    member_array_type;
-
-  member_array_type fields (nfields);
-
-  for (CORBA::ULong i = 0; i < nfields; ++i)
-    {
-      if (!(cdr >> TAO_InputCDR::to_string (fields[i].name.out (), 0)
-            && tc_demarshal (cdr, fields[i].type.out (), infos)))
-        return false;
-    }
-
-  typedef TAO::TypeCode::Struct<
-    CORBA::String_var,
-    CORBA::TypeCode_var,
-    member_array_type,
-    TAO::True_RefCount_Policy> typecode_type;
-
-
-  // Check if struct TypeCode is recursive.
-  if (kind == CORBA::tk_struct && find_recursive_tc (id.in (), tc, infos))
-    {
-      // Set remaining parameters.
-
-      typedef TAO::TypeCode::Recursive_Type<typecode_type,
-                                            CORBA::TypeCode_var,
-                                            member_array_type>
-        recursive_typecode_type;
-
-      recursive_typecode_type * const rtc =
-        dynamic_cast<recursive_typecode_type *> (tc);
-
-      ACE_ASSERT (rtc);
-
-      rtc->struct_parameters (name.in (),
-                              fields,
-                              nfields);
-    }
-  else
-    {
-      ACE_NEW_RETURN (tc,
-                      typecode_type (kind,
-                                     id.in (),
-                                     name.in (),
-                                     fields,     // Will be copied.
-                                     nfields),
-                      false);
-    }
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_union_factory (CORBA::TCKind /* kind */,
-                                        TAO_InputCDR & cdr,
-                                        CORBA::TypeCode_ptr & tc,
-                                        TC_Info_List & infos)
-{
-  // The remainder of a tk_enum TypeCode is encoded in a CDR
-  // encapsulation.
-
-  if (!start_cdr_encap_extraction (cdr))
-    return false;
-
-  // Extract the repository ID, name, discriminant type, default index
-  // and case count.
-  CORBA::String_var id, name;
-  CORBA::TypeCode_var discriminant_type;
-  CORBA::Long default_index = -1;
-  CORBA::ULong ncases = 0;  // Just 'n case :-)
-
-  if (!(cdr >> TAO_InputCDR::to_string (id.out (), 0)
-        && cdr >> TAO_InputCDR::to_string (name.out (), 0)
-        && cdr >> discriminant_type.out ())) // No need to use tc_demarshal()
-    return false;
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  CORBA::TCKind const discriminant_kind =
-    discriminant_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-  // Check for valid discriminant type.
-  if (!(discriminant_kind == CORBA::tk_enum
-        || discriminant_kind == CORBA::tk_ulong
-        || discriminant_kind == CORBA::tk_long
-        || discriminant_kind == CORBA::tk_ushort
-        || discriminant_kind == CORBA::tk_short
-        || discriminant_kind == CORBA::tk_char
-        || discriminant_kind == CORBA::tk_boolean
-        || discriminant_kind == CORBA::tk_longlong
-        || discriminant_kind == CORBA::tk_ulonglong))
-    return false;
-
-  if (!(cdr >> default_index
-        && default_index >= -1
-        && cdr >> ncases))
-    return false;
-
-  typedef union_elem_type       elem_type;
-  typedef union_case_array_type case_array_type;
-
-  case_array_type cases (ncases);
-
-  for (CORBA::ULong i = 0; i < ncases; ++i)
-    {
-      elem_type & member = cases[i];
-
-      TAO::TypeCode::Case<CORBA::String_var, CORBA::TypeCode_var> * the_case;
-
-      // Ugly.  *sigh*
-      switch (discriminant_kind)
-        {
-        case CORBA::tk_enum:  // Enumerators are encoded as unsigned longs.
-        case CORBA::tk_ulong:
-          {
-            CORBA::ULong label;
-            if (!(cdr >> label))
-              return false;
-
-            typedef TypeCode::Case_T<CORBA::ULong,
-                                     CORBA::String_var,
-                                     CORBA::TypeCode_var> case_type;
-
-            ACE_NEW_RETURN (the_case,
-                            case_type (label),
-                            false);
-          }
-          break;
-        case CORBA::tk_long:
-          {
-            CORBA::Long label;
-            if (!(cdr >> label))
-              return false;
-
-            typedef TypeCode::Case_T<CORBA::Long,
-                                     CORBA::String_var,
-                                     CORBA::TypeCode_var> case_type;
-
-            ACE_NEW_RETURN (the_case,
-                            case_type (label),
-                            false);
-          }
-          break;
-        case CORBA::tk_ushort:
-          {
-            CORBA::UShort label;
-            if (!(cdr >> label))
-              return false;
-
-            typedef TypeCode::Case_T<CORBA::UShort,
-                                     CORBA::String_var,
-                                     CORBA::TypeCode_var> case_type;
-
-            ACE_NEW_RETURN (the_case,
-                            case_type (label),
-                            false);
-          }
-          break;
-        case CORBA::tk_short:
-          {
-            CORBA::Short label;
-            if (!(cdr >> label))
-              return false;
-
-            typedef TypeCode::Case_T<CORBA::Short,
-                                     CORBA::String_var,
-                                     CORBA::TypeCode_var> case_type;
-
-            ACE_NEW_RETURN (the_case,
-                            case_type (label),
-                            false);
-          }
-          break;
-        case CORBA::tk_char:
-          {
-            CORBA::Char label;
-            if (!(cdr >> CORBA::Any::to_char (label)))
-              return false;
-
-            typedef TypeCode::Case_T<CORBA::Char,
-                                     CORBA::String_var,
-                                     CORBA::TypeCode_var> case_type;
-
-            ACE_NEW_RETURN (the_case,
-                            case_type (label),
-                            false);
-          }
-          break;
-        case CORBA::tk_boolean:
-          {
-            CORBA::Boolean label;
-            if (!(cdr >> CORBA::Any::to_boolean (label)))
-              return false;
-
-            typedef TypeCode::Case_T<CORBA::Boolean,
-                                     CORBA::String_var,
-                                     CORBA::TypeCode_var> case_type;
-
-            ACE_NEW_RETURN (the_case,
-                            case_type (label),
-                            false);
-          }
-          break;
-        case CORBA::tk_longlong:
-          {
-            CORBA::LongLong label;
-            if (!(cdr >> label))
-              return false;
-
-            typedef TypeCode::Case_T<CORBA::LongLong,
-                                     CORBA::String_var,
-                                     CORBA::TypeCode_var> case_type;
-
-            ACE_NEW_RETURN (the_case,
-                            case_type (label),
-                            false);
-          }
-          break;
-#if !defined (ACE_LACKS_LONGLONG_T)
-        case CORBA::tk_ulonglong:
-          {
-            CORBA::ULongLong label;
-            if (!(cdr >> label))
-              return false;
-
-            typedef TypeCode::Case_T<CORBA::ULongLong,
-                                     CORBA::String_var,
-                                     CORBA::TypeCode_var> case_type;
-
-            ACE_NEW_RETURN (the_case,
-                            case_type (label),
-                            false);
-          }
-          break;
-#endif  /* !ACE_LACKS_LONGLONG_T */
-        default:
-          return false;
-        }
-
-      elem_type case_value (the_case);
-      member.swap (case_value);  // Exception-safe
-
-      CORBA::String_var the_name;
-      CORBA::TypeCode_var the_type;
-
-      if (!(cdr >> TAO_InputCDR::to_string (the_name.out (), 0)
-            && tc_demarshal (cdr, the_type.out (), infos)))
-        return false;
-
-      member->name (the_name.in ());
-      member->type (the_type.in ());
-    }
-
-  typedef TAO::TypeCode::Union<CORBA::String_var,
-                               CORBA::TypeCode_var,
-                               case_array_type,
-                               TAO::True_RefCount_Policy> typecode_type;
-
-  // Check if union TypeCode is recursive.
-  if (find_recursive_tc (id.in (), tc, infos))
-    {
-      // Set remaining parameters.
-
-      typedef TAO::TypeCode::Recursive_Type<typecode_type,
-                                            CORBA::TypeCode_var,
-                                            case_array_type>
-        recursive_typecode_type;
-
-      recursive_typecode_type * const rtc =
-        dynamic_cast<recursive_typecode_type *> (tc);
-
-      ACE_ASSERT (rtc);
-
-      rtc->union_parameters (name.in (),
-                             discriminant_type,
-                             cases,     // Will be copied.
-                             ncases,
-                             default_index);
-    }
-  else
-    {
-      ACE_NEW_RETURN (tc,
-                      typecode_type (id.in (),
-                                     name.in (),
-                                     discriminant_type,
-                                     cases,     // Will be copied.
-                                     ncases,
-                                     default_index),
-                      false);
-    }
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_enum_factory (CORBA::TCKind /* kind */,
-                                       TAO_InputCDR & cdr,
-                                       CORBA::TypeCode_ptr & tc,
-                                       TC_Info_List &)
-{
-  // The remainder of a tk_enum TypeCode is encoded in a CDR
-  // encapsulation.
-
-  if (!start_cdr_encap_extraction (cdr))
-    return false;
-
-  // Extract the repository ID, name and number of fields.
-  CORBA::String_var id, name;
-  CORBA::ULong nenumerators;
-
-  if (!(cdr >> TAO_InputCDR::to_string (id.out (), 0)
-        && cdr >> TAO_InputCDR::to_string (name.out (), 0)
-        && cdr >> nenumerators))
-    return false;
-
-  ACE_Array_Base<CORBA::String_var> enumerators (nenumerators);
-
-  for (CORBA::ULong i = 0; i < nenumerators; ++i)
-    {
-      if (!(cdr >> TAO_InputCDR::to_string (enumerators[i].out (), 0)))
-        return false;
-    }
-
-  typedef TAO::TypeCode::Enum<
-    CORBA::String_var,
-    ACE_Array_Base<CORBA::String_var>,
-    TAO::True_RefCount_Policy> typecode_type;
-
-  ACE_NEW_RETURN (tc,
-                  typecode_type (id.in (),
-                                 name.in (),
-                                 enumerators,     // Will be copied.
-                                 nenumerators),
-                  false);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_string_factory (CORBA::TCKind kind,
-                                         TAO_InputCDR & cdr,
-                                         CORBA::TypeCode_ptr & tc,
-                                         TC_Info_List &)
-{
-  // A tk_string/tk_wstring TypeCode has a simple parameter list,
-  // i.e. it is not encoded in a CDR encapsulation.
-
-  CORBA::ULong bound;
-  if (!(cdr >> bound))
-    return false;
-
-  if (bound == 0)
-    {
-      // Just use the TypeCode constant.
-      if (kind == CORBA::tk_string)
-        tc = CORBA::TypeCode::_duplicate (CORBA::_tc_string);
-      else if (kind == CORBA::tk_wstring)
-        tc = CORBA::TypeCode::_duplicate (CORBA::_tc_wstring);
-      else
-        return false;
-
-      return true;
-    }
-
-  typedef TAO::TypeCode::String<TAO::True_RefCount_Policy> typecode_type;
-
-  ACE_NEW_RETURN (tc,
-                  typecode_type (kind, bound),
-                  false);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_sequence_factory (CORBA::TCKind kind,
-                                           TAO_InputCDR & cdr,
-                                           CORBA::TypeCode_ptr & tc,
-                                           TC_Info_List & infos)
-{
-  ACE_ASSERT (kind == CORBA::tk_sequence || kind == CORBA::tk_array);
-
-  // The remainder of a tk_sequence TypeCode is encoded in a CDR
-  // encapsulation.
-
-  if (!start_cdr_encap_extraction (cdr))
-    return false;
-
-  // Extract the repository ID, name and content type.
-  CORBA::TypeCode_var content_type;
-  CORBA::ULong length;
-
-  if (!(tc_demarshal (cdr, content_type.out (), infos)
-        && cdr >> length))
-    return false;
-
-  typedef TAO::TypeCode::Sequence<
-    CORBA::TypeCode_var,
-    TAO::True_RefCount_Policy> typecode_type;
-
-  ACE_NEW_RETURN (tc,
-                  typecode_type (kind, content_type, length),
-                  false);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_array_factory (CORBA::TCKind kind,
-                                        TAO_InputCDR & cdr,
-                                        CORBA::TypeCode_ptr & tc,
-                                        TC_Info_List & infos)
-{
-  return tc_sequence_factory (kind, cdr, tc, infos);
-}
-
-bool
-TAO::TypeCodeFactory::tc_alias_factory (CORBA::TCKind kind,
-                                        TAO_InputCDR & cdr,
-                                        CORBA::TypeCode_ptr & tc,
-                                        TC_Info_List & infos)
-{
-  // The remainder of a tk_alias or tk_value_box TypeCode is encoded
-  // in a CDR encapsulation.
-
-  if (!start_cdr_encap_extraction (cdr))
-    return false;
-
-  // Extract the repository ID, name and content type.
-  CORBA::String_var id, name;
-  CORBA::TypeCode_var content_type;
-  if (!(cdr >> TAO_InputCDR::to_string (id.out (), 0)
-        && cdr >> TAO_InputCDR::to_string (name.out (), 0)
-        && tc_demarshal (cdr, content_type.out (), infos)))
-    return false;
-
-  typedef TAO::TypeCode::Alias<
-    CORBA::String_var,
-    CORBA::TypeCode_var,
-    TAO::True_RefCount_Policy> typecode_type;
-
-  ACE_NEW_RETURN (tc,
-                  typecode_type (kind,
-                                 id.in (),
-                                 name.in (),
-                                 content_type),
-                  false);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_except_factory (CORBA::TCKind kind,
-                                         TAO_InputCDR & cdr,
-                                         CORBA::TypeCode_ptr & tc,
-                                         TC_Info_List & infos)
-{
-  return tc_struct_factory (kind, cdr, tc, infos);
-}
-
-bool
-TAO::TypeCodeFactory::tc_longlong_factory (CORBA::TCKind,
-                                           TAO_InputCDR &,
-                                           CORBA::TypeCode_ptr & tc,
-                                           TC_Info_List &)
-{
-  tc = CORBA::TypeCode::_duplicate (CORBA::_tc_longlong);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_ulonglong_factory (CORBA::TCKind,
-                                            TAO_InputCDR &,
-                                            CORBA::TypeCode_ptr & tc,
-                                            TC_Info_List &)
-{
-  tc = CORBA::TypeCode::_duplicate (CORBA::_tc_ulonglong);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_longdouble_factory (CORBA::TCKind,
-                                             TAO_InputCDR &,
-                                             CORBA::TypeCode_ptr & tc,
-                                             TC_Info_List &)
-{
-  tc = CORBA::TypeCode::_duplicate (CORBA::_tc_longdouble);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_wchar_factory (CORBA::TCKind,
-                                        TAO_InputCDR &,
-                                        CORBA::TypeCode_ptr & tc,
-                                        TC_Info_List &)
-{
-  tc = CORBA::TypeCode::_duplicate (CORBA::_tc_wchar);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_wstring_factory (CORBA::TCKind kind,
-                                          TAO_InputCDR & cdr,
-                                          CORBA::TypeCode_ptr & tc,
-                                          TC_Info_List & infos)
-{
-  return tc_string_factory (kind, cdr, tc, infos);
-}
-
-bool
-TAO::TypeCodeFactory::tc_fixed_factory (CORBA::TCKind,
-                                        TAO_InputCDR & cdr,
-                                        CORBA::TypeCode_ptr & tc,
-                                        TC_Info_List &)
-{
-  // A tk_fixed TypeCode has a simple parameter list, i.e. it is not
-  // encoded in a CDR encapsulation.
-
-  CORBA::UShort digits, scale;
-  if (!(cdr >> digits && cdr >> scale))
-    return false;
-
-  typedef TAO::TypeCode::Fixed<TAO::True_RefCount_Policy> typecode_type;
-
-  ACE_NEW_RETURN (tc,
-                  typecode_type (digits, scale),
-                  false);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_value_factory (CORBA::TCKind kind,
-                                        TAO_InputCDR & cdr,
-                                        CORBA::TypeCode_ptr & tc,
-                                        TC_Info_List & infos)
-{
-  // The remainder of a tk_value/tk_event TypeCode is encoded in a
-  // CDR encapsulation
-
-  if (!start_cdr_encap_extraction (cdr))
-    return false;
-
-  // Extract the repository ID, name and number of fields.
-  CORBA::String_var id;
-  if (!(cdr >> TAO_InputCDR::to_string (id.out (), 0)))
-    return false;
-
-//   if (ACE_OS::strcmp (id.in (), "IDL:omg.org/CORBA/ValueBase:1.0") == 0)
-//     {
-//       // No need to create a TypeCode.  Just use the TypeCode
-//       // constant.
-//       tc = CORBA::TypeCode::_duplicate (CORBA::_tc_ValueBase);
-
-//       return true;
-//     }
-//   else if (ACE_OS::strcmp (id.in (),
-//                            "IDL:omg.org/CORBA/EventBase:1.0") == 0)
-//     {
-//       // No need to create a TypeCode.  Just use the TypeCode
-//       // constant.
-//       tc = CORBA::TypeCode::_duplicate (CORBA::_tc_EventBase);
-
-//       return true;
-//     }
-
-  CORBA::String_var name;
-  CORBA::ValueModifier type_modifier;
-  CORBA::TypeCode_var concrete_base;
-  CORBA::ULong nfields;
-
-  if (!(cdr >> TAO_InputCDR::to_string (name.out (), 0)
-        && cdr >> type_modifier
-        && cdr >> concrete_base.out ()
-        && cdr >> nfields))
-    return false;
-
-  typedef ACE_Array_Base<TAO::TypeCode::Value_Field<CORBA::String_var,
-                                                    CORBA::TypeCode_var> >
-    member_array_type;
-
-  member_array_type fields (nfields);
-
-  for (CORBA::ULong i = 0; i < nfields; ++i)
-    {
-      TAO::TypeCode::Value_Field<CORBA::String_var,
-                                 CORBA::TypeCode_var> & field = fields[i];
-
-      if (!(cdr >> TAO_InputCDR::to_string (field.name.out (), 0)
-            && tc_demarshal (cdr, field.type.out (), infos)
-            && cdr >> field.visibility))
-        return false;
-    }
-
-  typedef TAO::TypeCode::Value<
-    CORBA::String_var,
-    CORBA::TypeCode_var,
-    member_array_type,
-    TAO::True_RefCount_Policy> typecode_type;
-
-  // Check if valuetype/eventtype TypeCode is recursive.
-  if (find_recursive_tc (id.in (), tc, infos))
-    {
-      // Set remaining parameters.
-
-      typedef TAO::TypeCode::Recursive_Type<typecode_type,
-                                            CORBA::TypeCode_var,
-                                            member_array_type>
-        recursive_typecode_type;
-
-      recursive_typecode_type * const rtc =
-        dynamic_cast<recursive_typecode_type *> (tc);
-
-      ACE_ASSERT (rtc);
-
-      rtc->valuetype_parameters (name.in (),
-                                 type_modifier,
-                                 concrete_base,
-                                 fields,     // Will be copied.
-                                 nfields);
-    }
-  else
-    {
-      ACE_NEW_RETURN (tc,
-                      typecode_type (kind,
-                                     id.in (),
-                                     name.in (),
-                                     type_modifier,
-                                     concrete_base,
-                                     fields,     // Will be copied.
-                                     nfields),
-                      false);
-    }
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_value_box_factory (CORBA::TCKind kind,
-                                            TAO_InputCDR & cdr,
-                                            CORBA::TypeCode_ptr & tc,
-                                            TC_Info_List & infos)
-{
-  return tc_alias_factory (kind, cdr, tc, infos);
-}
-
-bool
-TAO::TypeCodeFactory::tc_native_factory (CORBA::TCKind,
-                                         TAO_InputCDR & cdr,
-                                         CORBA::TypeCode_ptr & tc,
-                                         TC_Info_List & infos)
-{
-  return tc_objref_factory (CORBA::tk_native, cdr, tc, infos);
-}
-
-bool
-TAO::TypeCodeFactory::tc_abstract_interface_factory (CORBA::TCKind,
-                                                     TAO_InputCDR & cdr,
-                                                     CORBA::TypeCode_ptr & tc,
-                                                     TC_Info_List & infos)
-{
-  return tc_objref_factory (CORBA::tk_abstract_interface, cdr, tc, infos);
-}
-
-bool
-TAO::TypeCodeFactory::tc_local_interface_factory (CORBA::TCKind,
-                                                  TAO_InputCDR & cdr,
-                                                  CORBA::TypeCode_ptr & tc,
-                                                  TC_Info_List & infos)
-{
-  return tc_objref_factory (CORBA::tk_local_interface, cdr, tc, infos);
-}
-
-bool
-TAO::TypeCodeFactory::tc_component_factory (CORBA::TCKind,
-                                            TAO_InputCDR & cdr,
-                                            CORBA::TypeCode_ptr & tc,
-                                            TC_Info_List & infos)
-{
-  return tc_objref_factory (CORBA::tk_component, cdr, tc, infos);
-}
-
-bool
-TAO::TypeCodeFactory::tc_home_factory (CORBA::TCKind,
-                                       TAO_InputCDR & cdr,
-                                       CORBA::TypeCode_ptr & tc,
-                                       TC_Info_List & infos)
-{
-  return tc_objref_factory (CORBA::tk_home, cdr, tc, infos);
-}
-
-bool
-TAO::TypeCodeFactory::tc_event_factory (CORBA::TCKind kind,
-                                        TAO_InputCDR & cdr,
-                                        CORBA::TypeCode_ptr & tc,
-                                        TC_Info_List & infos)
-{
-  return tc_value_factory (kind, cdr, tc, infos);
-}
-
-// ---------------------------------------------------------------
-
-namespace
-{
-  bool
-  tc_demarshal (TAO_InputCDR & cdr,
-                CORBA::TypeCode_ptr & tc,
-                TAO::TypeCodeFactory::TC_Info_List & infos)
-  {
-    // ULong since we need to detect indirected TypeCodes, too.
-
-    CORBA::ULong kind;
-    if (!(cdr >> kind)
-        || (kind >= static_cast<CORBA::ULong> (CORBA::TAO_TC_KIND_COUNT)
-            && kind != TYPECODE_INDIRECTION))
-      return false;
-
-    if (kind == TYPECODE_INDIRECTION)
-      return tc_demarshal_indirection (cdr, tc, infos);
-
-    using namespace TAO::TypeCodeFactory;
-
-    static factory const factory_map[] =
-      {
-        tc_null_factory,
-        tc_void_factory,
-        tc_short_factory,
-        tc_long_factory,
-        tc_ushort_factory,
-        tc_ulong_factory,
-        tc_float_factory,
-        tc_double_factory,
-        tc_boolean_factory,
-        tc_char_factory,
-        tc_octet_factory,
-        tc_any_factory,
-        tc_TypeCode_factory,
-        tc_Principal_factory,
-        tc_objref_factory,
-        tc_struct_factory,
-        tc_union_factory,
-        tc_enum_factory,
-        tc_string_factory,
-        tc_sequence_factory,
-        tc_array_factory,
-        tc_alias_factory,
-        tc_except_factory,
-        tc_longlong_factory,
-        tc_ulonglong_factory,
-        tc_longdouble_factory,
-        tc_wchar_factory,
-        tc_wstring_factory,
-        tc_fixed_factory,
-        tc_value_factory,
-        tc_value_box_factory,
-        tc_native_factory,
-        tc_abstract_interface_factory,
-        tc_local_interface_factory,
-        tc_component_factory,
-        tc_home_factory,
-        tc_event_factory
-      };
-
-    return factory_map[kind] (static_cast<CORBA::TCKind> (kind),
-                              cdr,
-                              tc,
-                              infos);
-  }
-
-  bool
-  tc_demarshal_indirection (TAO_InputCDR & cdr,
-                            CORBA::TypeCode_ptr & tc,
-                            TAO::TypeCodeFactory::TC_Info_List & infos)
-  {
-    CORBA::Long offset;
-
-    if (!(cdr >> offset) || offset >= -4)
-      {
-        // Offsets must be negative since they point back to a
-        // TypeCode found earlier in the CDR stream.  They must be
-        // less than -4 since an offset of -4 points back to the
-        // indirection TypeCode itself, meaning that it would be
-        // self-indirecting.
-        return false;
-      }
-
-//     ACE_Message_Block * const mb =
-//       const_cast<ACE_Message_Block *> (cdr.start ());
-
-//     TAO_InputCDR indir_stream (mb->rd_ptr () + offset - 4,
-    TAO_InputCDR indir_stream (cdr.rd_ptr () + offset - sizeof (CORBA::Long),
-                               (-offset) + sizeof (CORBA::Long),
-                               cdr.byte_order ());
-
-    if (!indir_stream.good_bit ())
-      {
-        return false;
-      }
-
-    CORBA::TCKind kind;
-    if (!(indir_stream >> kind)
-
-        // Indirected TypeCode must point to top-level TypeCode.
-        || static_cast<CORBA::ULong> (kind) == TYPECODE_INDIRECTION
-
-        // Only struct, union and valuetype TypeCodes may be recursive.
-        || !(kind == CORBA::tk_struct
-             || kind == CORBA::tk_union
-             || kind == CORBA::tk_value
-             || kind == CORBA::tk_event)
-
-        // Currently all recursive TypeCodes have complex parameter
-        // lists, meaning they are encoded as CDR encapsulations.
-        || !start_cdr_encap_extraction (indir_stream))
-      {
-        return false;
-      }
-
-    /**
-     * @todo Recursive TypeCode demarshaling is currently suboptimal
-     *       due to redundant demarshaling of TypeCode parameters,
-     *       such as repository ID, and excessive
-     *       allocations/copying.
-     */
-
-    CORBA::String_var id;
-    if (!(indir_stream >> TAO_InputCDR::to_string (id.out (), 0)))
-      return false;
-
-    // Don't bother demarshaling the rest of the parameters.  They will
-    // be handled by the top-level TypeCode demarshaling call.
-
-    switch (kind)
-      {
-      case CORBA::tk_struct:
-        {
-          typedef ACE_Array_Base<
-            TAO::TypeCode::Struct_Field<
-              CORBA::String_var,
-              CORBA::TypeCode_var> > member_array_type;
-
-          typedef TAO::TypeCode::Struct<
-            CORBA::String_var,
-            CORBA::TypeCode_var,
-            member_array_type,
-            TAO::True_RefCount_Policy> typecode_type;
-
-          typedef TAO::TypeCode::Recursive_Type<typecode_type,
-                                                CORBA::TypeCode_var,
-                                                member_array_type>
-            recursive_typecode_type;
-
-          ACE_NEW_RETURN (tc,
-                          recursive_typecode_type (kind,
-                                                   id.in ()),
-                          false);
-        }
-        break;
-      case CORBA::tk_union:
-        {
-          typedef union_case_array_type member_array_type;
-
-          typedef TAO::TypeCode::Union<
-            CORBA::String_var,
-            CORBA::TypeCode_var,
-            member_array_type,
-            TAO::True_RefCount_Policy> typecode_type;
-
-          typedef TAO::TypeCode::Recursive_Type<typecode_type,
-                                                CORBA::TypeCode_var,
-                                                member_array_type>
-            recursive_typecode_type;
-
-          ACE_NEW_RETURN (tc,
-                          recursive_typecode_type (kind,
-                                                   id.in ()),
-                          false);
-        }
-        break;
-      case CORBA::tk_value:
-      case CORBA::tk_event:
-        {
-          typedef ACE_Array_Base<
-            TAO::TypeCode::Value_Field<
-              CORBA::String_var,
-              CORBA::TypeCode_var> > member_array_type;
-
-          typedef TAO::TypeCode::Value<
-            CORBA::String_var,
-            CORBA::TypeCode_var,
-            member_array_type,
-            TAO::True_RefCount_Policy> typecode_type;
-
-          typedef TAO::TypeCode::Recursive_Type<typecode_type,
-                                                CORBA::TypeCode_var,
-                                                member_array_type>
-            recursive_typecode_type;
-
-          ACE_NEW_RETURN (tc,
-                          recursive_typecode_type (kind,
-                                                   id.in ()),
-                          false);
-        }
-        break;
-      default:
-        return false;  // We should never get here.
-      };
-
-    size_t const old_size = infos.size ();
-    if (infos.size (old_size + 1) == -1)  // Incremental growth -- *sigh*
-      return false;
-
-    TAO::TypeCodeFactory::TC_Info & info = infos[old_size];
-
-    ACE_DECLARE_NEW_CORBA_ENV;
-    info.id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (false);  // Should never throw!
-
-    info.type = tc;
-
-    return true;
-  }
-}
-
-// ----------------------------------------------------------------
-
-bool
-operator>> (TAO_InputCDR & cdr,
-            CORBA::TypeCode_ptr & tc)
-{
-  TAO::TypeCodeFactory::TC_Info_List infos;
-
-  return tc_demarshal (cdr, tc, infos);
-}
diff --git a/TAO/tao/TypeCode_CDR_Extraction.h b/TAO/tao/TypeCode_CDR_Extraction.h
deleted file mode 100644
index b7571fbfbf4..00000000000
--- a/TAO/tao/TypeCode_CDR_Extraction.h
+++ /dev/null
@@ -1,196 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    TypeCode_CDR_Extraction.h
- *
- *  $Id$
- *
- *  Header file for TAO TypeCode CDR extraction operations.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_TYPECODE_CDR_EXTRACTION_H
-#define TAO_TYPECODE_CDR_EXTRACTION_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Typecode_typesC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-template <class T> class ACE_Array_Base;
-
-namespace TAO
-{
-  namespace TypeCodeFactory
-  {
-    struct TC_Info;
-    typedef ACE_Array_Base<TC_Info> TC_Info_List;
-
-    typedef bool (*factory) (CORBA::TCKind,
-                             TAO_InputCDR &,
-                             CORBA::TypeCode_ptr &,
-                             TC_Info_List &);
-
-    bool tc_null_factory       (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_void_factory       (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_short_factory      (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_long_factory       (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_ushort_factory     (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_ulong_factory      (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_float_factory      (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_double_factory     (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_boolean_factory    (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_char_factory       (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_octet_factory      (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_any_factory        (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_TypeCode_factory   (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_Principal_factory  (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_objref_factory     (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_struct_factory     (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_union_factory      (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_enum_factory       (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_string_factory     (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_sequence_factory   (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_array_factory      (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_alias_factory      (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_except_factory     (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_longlong_factory   (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_ulonglong_factory  (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_longdouble_factory (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_wchar_factory      (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_wstring_factory    (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_fixed_factory      (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_value_factory      (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_value_box_factory  (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_native_factory     (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_abstract_interface_factory (CORBA::TCKind kind,
-                                        TAO_InputCDR & cdr,
-                                        CORBA::TypeCode_ptr & tc,
-                                        TC_Info_List & infos);
-    bool tc_local_interface_factory (CORBA::TCKind kind,
-                                     TAO_InputCDR & cdr,
-                                     CORBA::TypeCode_ptr & tc,
-                                     TC_Info_List & infos);
-    bool tc_component_factory  (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_home_factory       (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_event_factory      (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-
-  }  // End namespace TypeCodeFactory
-}  // End namespace TAO
-
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_TYPECODE_CDR_EXTRACTION_H */
diff --git a/TAO/tao/TypeCode_Case.cpp b/TAO/tao/TypeCode_Case.cpp
deleted file mode 100644
index 078071e2287..00000000000
--- a/TAO/tao/TypeCode_Case.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-// $Id$
-
-#ifndef TAO_TYPECODE_CASE_CPP
-#define TAO_TYPECODE_CASE_CPP
-
-#include "TypeCode_Case.h"
-#include "ace/OS_NS_string.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/TypeCode_Case.inl"
-#endif /* __ACE_INLINE__ */
-
-
-template <typename StringType, typename TypeCodeType>
-TAO::TypeCode::Case<StringType, TypeCodeType>::~Case (void)
-{
-}
-
-template <typename StringType, typename TypeCodeType>
-bool
-TAO::TypeCode::Case<StringType, TypeCodeType>::equal (CORBA::ULong index,
-                                                      CORBA::TypeCode_ptr tc
-                                                      ACE_ENV_ARG_DECL) const
-{
-  // Check case names.
-  char const * const lhs_name = this->name ();
-  char const * const rhs_name = tc->member_name (index
-                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (ACE_OS::strcmp (lhs_name, rhs_name) != 0)
-    return 0;
-
-  // Check case TypeCodes.
-  CORBA::TypeCode_ptr const lhs_tc = this->type ();
-  CORBA::TypeCode_var const rhs_tc =
-    tc->member_type (index
-                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Boolean const equal_members =
-    lhs_tc->equal (rhs_tc.in ()
-                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (!equal_members)
-    return 0;
-
-  // Check case label.
-  return this->equal_label (index,
-                            tc
-                            ACE_ENV_ARG_PARAMETER);
-}
-
-template <typename StringType, typename TypeCodeType>
-bool
-TAO::TypeCode::Case<StringType, TypeCodeType>::equivalent (
-  CORBA::ULong index,
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // Member names are ignore when determining equivalence.
-
-  // Check case TypeCodes.
-  CORBA::TypeCode_ptr const lhs_tc = this->type ();
-  CORBA::TypeCode_var const rhs_tc =
-    tc->member_type (index
-                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Boolean const equivalent_members =
-    lhs_tc->equivalent (rhs_tc.in ()
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (!equivalent_members)
-    return 0;
-
-  // Check case label.
-  // The label must be equal when determining equivalence, too.
-  return this->equal_label (index,
-                            tc
-                            ACE_ENV_ARG_PARAMETER);
-}
-
-#endif  /* TAO_TYPECODE_CASE_CPP */
diff --git a/TAO/tao/TypeCode_Case.h b/TAO/tao/TypeCode_Case.h
deleted file mode 100644
index 258b3ce299f..00000000000
--- a/TAO/tao/TypeCode_Case.h
+++ /dev/null
@@ -1,204 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    TypeCode_Case.h
- *
- *  $Id$
- *
- *  Header file for @c TAO::TypeCode::Case type.
- *
- *  @author Ossama Othman
- */
-//=============================================================================
-
-#ifndef TAO_TYPECODE_CASE_H
-#define TAO_TYPECODE_CASE_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-namespace CORBA
-{
-  class TypeCode;
-  typedef TypeCode* TypeCode_ptr;
-
-  class Any;
-}
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-
-    /**
-     * @class Case
-     *
-     * @brief Abstract base class for that represents an IDL @c union
-     *        case/member.
-     *
-     * This class hides the actual IDL @c union member label value
-     * from the @c TAO::TypeCode::Union class by relying on a
-     * CORBA::Any return value that corresponds to the @c
-     * CORBA::TypeCode::member_label() return type.  It also allows
-     * the @c TAO::TypeCode::Union class to marshal the member label
-     * values into a CDR stream without knowledge of the underlying
-     * member label values.
-     */
-    template <typename StringType, typename TypeCodeType>
-    class Case
-    {
-    public:
-
-      /// Constructor.
-      /**
-       * Constructor used when creating static @c union @c TypeCodes.
-       */
-      Case (char const * name,
-            TypeCodeType tc);
-
-      /// Constructor.
-      /**
-       * Constructor used when creating dynamic @c union @c TypeCodes.
-       */
-      Case (void);
-
-      /// Destructor.
-      virtual ~Case (void);
-
-      /// Cloning/copying operation.
-      virtual Case * clone (void) const = 0;
-
-      /// Return the IDL @c union case label value embedded within a
-      /// @c CORBA::Any.
-      virtual CORBA::Any * label (ACE_ENV_SINGLE_ARG_DECL) const = 0;
-
-      /// Get the name of the @c union case/member.
-      char const * name (void) const;
-
-      /// Set the name of the @c union case/member.
-      void name (char const * the_name);
-
-      /// Get the @c CORBA::TypeCode of the @c union case/member.
-      /**
-       * @note The reference count is not manipulated by this method,
-       *       i.e., ownership is retained by this class.
-       */
-      CORBA::TypeCode_ptr type (void) const;
-
-      /// Set the @c CORBA::TypeCode of the @c union case/member.
-      /**
-       * @note @c CORBA::TypeCode::_duplicate() is called on the
-       *       @c TypeCode @a tc.
-       */
-      void type (CORBA::TypeCode_ptr tc);
-
-      /// Marshal this IDL @c union member into the given output CDR
-      /// stream.
-      bool marshal (TAO_OutputCDR & cdr,
-                    CORBA::ULong offset) const;
-
-      /// Check for equality of the @c case attributes contained by this
-      /// class and the corresponding member attributes at index "@a
-      /// index" in the given @c TypeCode @a tc.
-      bool equal (CORBA::ULong index,
-                  CORBA::TypeCode_ptr tc
-                  ACE_ENV_ARG_DECL) const;
-
-      /// Check for equivalence of the @c case attributes contained by
-      /// this class and the corresponding member attributes at index
-      /// "@a index" in the given @c TypeCode @a tc.
-      bool equivalent (CORBA::ULong index,
-                       CORBA::TypeCode_ptr tc
-                       ACE_ENV_ARG_DECL) const;
-
-    protected:
-
-      /// Marshal the IDL @c union @c case label value into the given
-      /// output CDR stream.
-      virtual bool marshal_label (TAO_OutputCDR & cdr) const = 0;
-
-      /// Verify equality of member labels.
-      /**
-       * Performing member label equality comparisons in the @c Case
-       * subclass allows us to avoid performing interpretive
-       * extraction of the value from the @c Any returned from the
-       * "right hand side" operand @c TypeCode since the @c Case
-       * subclass already knows what type and value should be
-       * extracted from the @c Any.
-       *
-       * @param index Member index of given @c TypeCode @a tc being
-       *              tested.
-       * @param tc    The @c TypeCode whose member "@a index" label is
-       *              being tested.
-       */
-      virtual bool equal_label (CORBA::ULong index,
-                                CORBA::TypeCode_ptr tc
-                                ACE_ENV_ARG_DECL) const = 0;
-
-    private:
-
-      /// The name of the case.
-      StringType name_;
-
-      /// Pointer to the @c CORBA::TypeCode of the case.
-      /**
-       * A pointer to the @c CORBA::TypeCode_ptr rather than the
-       * @c CORBA::TypeCode_ptr itself is stored since that address is
-       * well-defined.  We may not know the value of the @c
-       * CORBA::TypeCode_ptr when creating this @c Case statically at
-       * compile-time, hence the indirection.
-       *
-       * @note This @c TypeCode is released upon destruction of this
-       *       @c Case.
-       */
-      TypeCodeType type_;
-
-    };
-
-    typedef Case<CORBA::String_var, CORBA::TypeCode_var> Case_Dynamic;
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-namespace ACE
-{
-  /// @see ace/Value_Ptr.h.
-  template <typename T> struct VP_traits;
-
-  template <>
-  struct TAO_Export VP_traits<TAO::TypeCode::Case_Dynamic>
-  {
-    /// Copy the given object.
-    static TAO::TypeCode::Case_Dynamic * clone (
-      TAO::TypeCode::Case_Dynamic const * p)
-    {
-      return p->clone ();
-    }
-  };
-
-} // End namespace ACE namespace.
-
-
-#ifdef __ACE_INLINE__
-# include "tao/TypeCode_Case.inl"
-#endif /* __ACE_INLINE__ */
-
-#ifdef ACE_TEMPLATES_REQUIRE_SOURCE
-# include "tao/TypeCode_Case.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
-# pragma implementation ("TypeCode_Case.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_TYPECODE_CASE_H */
diff --git a/TAO/tao/TypeCode_Case.inl b/TAO/tao/TypeCode_Case.inl
deleted file mode 100644
index 1601ec87967..00000000000
--- a/TAO/tao/TypeCode_Case.inl
+++ /dev/null
@@ -1,76 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#include "tao/CDR.h"
-#include "tao/TypeCode_Traits.h"
-
-
-template <typename StringType, typename TypeCodeType>
-ACE_INLINE
-TAO::TypeCode::Case<StringType, TypeCodeType>::Case (
-  char const * member_name,
-  TypeCodeType member_type)
-  : name_ (member_name)
-  , type_ (member_type)
-{
-}
-
-template <typename StringType, typename TypeCodeType>
-ACE_INLINE
-TAO::TypeCode::Case<StringType, TypeCodeType>::Case (void)
-  : name_ ()
-  , type_ ()
-{
-  // Only used when StringType and TypeCodeType are CORBA::String_var
-  // and CORBA::TypeCode_var, respectively.
-}
-
-template <typename StringType, typename TypeCodeType>
-ACE_INLINE bool
-TAO::TypeCode::Case<StringType, TypeCodeType>::marshal (
-  TAO_OutputCDR & cdr,
-  CORBA::ULong offset) const
-{
-  return
-    this->marshal_label (cdr)
-    && (cdr << TAO_OutputCDR::from_string (
-         Traits<StringType>::get_string (this->name_), 0))
-    && TAO::TypeCode::marshal (cdr,
-                               Traits<StringType>::get_typecode (this->type_),
-                               offset + cdr.total_length ());
-}
-
-template <typename StringType, typename TypeCodeType>
-ACE_INLINE char const *
-TAO::TypeCode::Case<StringType, TypeCodeType>::name (void) const
-{
-  return
-    Traits<StringType>::get_string (this->name_);
-}
-
-template <typename StringType, typename TypeCodeType>
-ACE_INLINE void
-TAO::TypeCode::Case<StringType, TypeCodeType>::name (
-  char const * the_name)
-{
-  this->name_ = the_name;
-}
-
-template <typename StringType, typename TypeCodeType>
-ACE_INLINE CORBA::TypeCode_ptr
-TAO::TypeCode::Case<StringType, TypeCodeType>::type (void) const
-{
-  return
-    Traits<StringType>::get_typecode (this->type_);
-}
-
-template <typename StringType, typename TypeCodeType>
-ACE_INLINE void
-TAO::TypeCode::Case<StringType, TypeCodeType>::type (CORBA::TypeCode_ptr tc)
-{
-  // This assignment works since it is only used when TypeCodeType is
-  // "CORBA::TypeCode_var", not in the "CORBA::TypeCode_ptr const *"
-  // case.
-  this->type_ = CORBA::TypeCode::_duplicate (tc);
-}
diff --git a/TAO/tao/TypeCode_Case_T.cpp b/TAO/tao/TypeCode_Case_T.cpp
deleted file mode 100644
index 204f85a2a1a..00000000000
--- a/TAO/tao/TypeCode_Case_T.cpp
+++ /dev/null
@@ -1,162 +0,0 @@
-// $Id$
-
-#ifndef TAO_TYPECODE_CASE_T_CPP
-#define TAO_TYPECODE_CASE_T_CPP
-
-#include "TypeCode_Case_T.h"
-
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/SystemException.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/TypeCode_Case_T.inl"
-#endif /* __ACE_INLINE__ */
-
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    template <typename T>
-    struct Case_Traits
-    {
-      inline static T any_from (T v)
-      {
-        return v;
-      }
-
-      inline static T & any_to (T & v)
-      {
-        return v;
-      }
-    };
-
-    // Specializations for types that require wrapper for Any
-    // insertion.  Note that we only define specializations for types
-    // that can be used in an IDL union discriminator.
-
-    template <>
-    struct Case_Traits<CORBA::Boolean>
-    {
-      inline static CORBA::Any::from_boolean any_from (CORBA::Boolean v)
-      {
-        return CORBA::Any::from_boolean (v);
-      }
-
-      inline static CORBA::Any::to_boolean any_to (CORBA::Boolean & v)
-      {
-        return CORBA::Any::to_boolean (v);
-      }
-    };
-
-    template <>
-    struct Case_Traits<CORBA::Char>
-    {
-      inline static CORBA::Any::from_char any_from (CORBA::Char v)
-      {
-        return CORBA::Any::from_char (v);
-      }
-
-      inline static CORBA::Any::to_char any_to (CORBA::Char & v)
-      {
-        return CORBA::Any::to_char (v);
-      }
-    };
-
-  } // End TypeCode namespace
-}  // End TAO namespace
-
-// ----------------------------------------------------------------
-
-
-template <typename DiscriminatorType,
-          typename StringType,
-          typename TypeCodeType>
-TAO::TypeCode::Case<StringType, TypeCodeType> *
-TAO::TypeCode::Case_T<DiscriminatorType,
-                      StringType,
-                      TypeCodeType>::clone (void) const
-{
-  Case<StringType, TypeCodeType> * p = 0;
-
-  typedef Case_T<DiscriminatorType,
-                 StringType,
-                 TypeCodeType> case_type;
-
-  // The compiler generated memberwise copy constructor is sufficient.
-  ACE_NEW_RETURN (p,
-                  case_type (*this),
-                  p);
-
-  return p;
-}
-
-template <typename DiscriminatorType,
-          typename StringType,
-          typename TypeCodeType>
-bool
-TAO::TypeCode::Case_T<DiscriminatorType,
-                      StringType,
-                      TypeCodeType>::marshal_label (TAO_OutputCDR & cdr) const
-{
-  return
-    (cdr <<
-     TAO::TypeCode::Case_Traits<DiscriminatorType>::any_from (this->label_));
-}
-
-template <typename DiscriminatorType,
-          typename StringType,
-          typename TypeCodeType>
-bool
-TAO::TypeCode::Case_T<DiscriminatorType,
-                      StringType,
-                      TypeCodeType>::equal_label (CORBA::ULong index,
-                                                  CORBA::TypeCode_ptr tc
-                                                  ACE_ENV_ARG_DECL) const
-{
-  CORBA::Any_var const any = tc->member_label (index
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-  // The equality operator == below is guaranteed to be defined for
-  // the discriminator type since an IDL union discriminator type must
-  // be any of the following: (1) an integer, (2) a character, (3) a
-  // boolean, or (4) an enumeration.
-
-  DiscriminatorType tc_label;
-  if ((any.in ()
-       >>= TAO::TypeCode::Case_Traits<DiscriminatorType>::any_to (tc_label))
-      && this->label_ == tc_label)
-    {
-      return true;
-    }
-
-  return false;
-}
-
-template <typename DiscriminatorType,
-          typename StringType,
-          typename TypeCodeType>
-CORBA::Any *
-TAO::TypeCode::Case_T<DiscriminatorType,
-                      StringType,
-                      TypeCodeType>::label (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  CORBA::Any * value;
-
-  ACE_NEW_THROW_EX (value,
-                    CORBA::Any,
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Any_var safe_value (value);
-
-  *value <<=
-    TAO::TypeCode::Case_Traits<DiscriminatorType>::any_from (this->label_);
-
-  return safe_value._retn ();
-}
-
-
-#endif  /* TAO_TYPECODE_CASE_T_CPP */
diff --git a/TAO/tao/TypeCode_Case_T.h b/TAO/tao/TypeCode_Case_T.h
deleted file mode 100644
index ea36c766bc7..00000000000
--- a/TAO/tao/TypeCode_Case_T.h
+++ /dev/null
@@ -1,145 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    TypeCode_Case_T.h
- *
- *  $Id$
- *
- *  Header file for @c TAO::TypeCode::Case_T template.
- *
- *  @author Ossama Othman
- */
-//=============================================================================
-
-#ifndef TAO_TYPECODE_CASE_T_H
-#define TAO_TYPECODE_CASE_T_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TypeCode_Case.h"
-
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    /**
-     * @class Case_T
-     *
-     * @brief Representation of an OMG IDL defined @c union @c case.
-     *
-     * A @c Case_T contains the corresponding case label value, name and
-     * pointer to the @c CORBA::TypeCode for a given OMG IDL @c union
-     * @c case.  For
-     * example, the cases in following OMG IDL @c union:
-     *
-     * \code
-     *   union Foo switch (short)
-     *   {
-     *     case 0:
-     *     case 1:  short a;
-     *     case 2:  long  b;
-     *     default: octet c;
-     *   };
-     * \endcode
-     *
-     * would be represented using the following statically instantiated
-     * @c TAO::TypeCode::Case_T array:
-     *
-     * \code
-     *   typedef TAO::TypeCode::Case_T<CORBA::Short, char const *> Foo_Case;
-     *   Foo_Case _tao_cases_Foo[] =
-     *     {
-     *       Foo_Case (0, "a", &CORBA::_tc_short),
-     *       Foo_Case (1, "a", &CORBA::_tc_short),
-     *       Foo_Case (2, "b", &CORBA::_tc_long),
-     *       Foo_Case (0, "c", &CORBA::_tc_octet)
-     *     };
-     * \endcode
-     *
-     * The @c default index is passed directly to the
-     * @c TAO::TypeCode::Union constructor.
-     *
-     * The template parameter @a DISCRIMINATOR_TYPE is the
-     * corresponding C++ type for the IDL defined @c union
-     * discriminator type.  For example, a @c union with an IDL @c
-     * short discriminator will have a corresponding @c CORBA::Short
-     * C++ type.  This template parameter is necessary to allow the
-     * actual @c case label value to be stored as its actual type,
-     * which is particularly important when marshaling that value into
-     * a CDR stream.
-     *
-     * The template parameter @a StringType is either @c char @c
-     * const @c * or @c CORBA::String_var.  The latter is only used
-     * when creating @c CORBA::tk_union @c TypeCode dynamically, such
-     * as through the TypeCodeFactory.
-     */
-    template <typename DiscriminatorType,
-              typename StringType,
-              typename TypeCodeType>
-    class Case_T : public Case<StringType, TypeCodeType>
-    {
-    public:
-
-      /// Constructor.
-      Case_T (DiscriminatorType member_label,
-              char const * member_name,
-              TypeCodeType member_type);
-
-      /// Constructor.
-      /**
-       * Constructor only used in the dynamically constructed @c union
-       * @c TypeCode case.
-       */
-      Case_T (DiscriminatorType member_label);
-
-      /**
-       * @name @c TAO::TypeCode::Case Methods
-       *
-       * Methods required by the @c TAO::TypeCode::Case abstract base
-       * class.
-       *
-       * @see @c TAO::TypeCode::Case
-       */
-      //@{
-      Case<StringType, TypeCodeType> * clone (void) const;
-      virtual CORBA::Any * label (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual bool marshal_label (TAO_OutputCDR & cdr) const;
-      virtual bool equal_label (CORBA::ULong index,
-                                CORBA::TypeCode_ptr tc
-                                ACE_ENV_ARG_DECL) const;
-      //@}
-
-    private:
-
-      /// IDL @c union case/member label value.
-      DiscriminatorType const label_;
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/TypeCode_Case_T.inl"
-#endif /* __ACE_INLINE__ */
-
-#ifdef ACE_TEMPLATES_REQUIRE_SOURCE
-# include "tao/TypeCode_Case_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
-# pragma implementation ("TypeCode_Case_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_TYPECODE_CASE_T_H */
diff --git a/TAO/tao/TypeCode_Case_T.inl b/TAO/tao/TypeCode_Case_T.inl
deleted file mode 100644
index b6ac33bd18e..00000000000
--- a/TAO/tao/TypeCode_Case_T.inl
+++ /dev/null
@@ -1,29 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-template <typename DiscriminatorType,
-          typename StringType,
-          typename TypeCodeType>
-ACE_INLINE
-TAO::TypeCode::Case_T<DiscriminatorType,
-                      StringType,
-                      TypeCodeType>::Case_T (DiscriminatorType member_label,
-                                             char const * member_name,
-                                             TypeCodeType member_type)
-  : Case<StringType, TypeCodeType> (member_name, member_type)
-  , label_ (member_label)
-{
-}
-
-template <typename DiscriminatorType,
-          typename StringType,
-          typename TypeCodeType>
-ACE_INLINE
-TAO::TypeCode::Case_T<DiscriminatorType,
-                      StringType,
-                      TypeCodeType>::Case_T (DiscriminatorType member_label)
-  : Case<StringType, TypeCodeType> ()
-  , label_ (member_label)
-{
-}
diff --git a/TAO/tao/TypeCode_Constants.cpp b/TAO/tao/TypeCode_Constants.cpp
deleted file mode 100644
index fe6b46d2c1f..00000000000
--- a/TAO/tao/TypeCode_Constants.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-// $Id$
-
-
-#include "TypeCode_Constants.h"
-
-
-ACE_RCSID (tao,
-           TypeCode_Constants,
-           "$Id$")
-
-
-#include "Null_RefCount_Policy.h"
-#include "Empty_Param_TypeCode.h"
-#include "Objref_TypeCode_Static.h"
-#include "String_TypeCode_Static.h"
-
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    // Notice that these are all statically instantiated and not
-    // exported.  There CORBA::TypeCode_ptr counterparts are, however,
-    // exported.
-
-    Empty_Param tc_null       (CORBA::tk_null);
-    Empty_Param tc_void       (CORBA::tk_void);
-    Empty_Param tc_boolean    (CORBA::tk_boolean);
-    Empty_Param tc_char       (CORBA::tk_char);
-    Empty_Param tc_wchar      (CORBA::tk_wchar);
-    Empty_Param tc_short      (CORBA::tk_short);
-    Empty_Param tc_ushort     (CORBA::tk_ushort);
-    Empty_Param tc_long       (CORBA::tk_long);
-    Empty_Param tc_ulong      (CORBA::tk_ulong);
-    Empty_Param tc_longlong   (CORBA::tk_longlong);
-    Empty_Param tc_ulonglong  (CORBA::tk_ulonglong);
-    Empty_Param tc_float      (CORBA::tk_float);
-    Empty_Param tc_double     (CORBA::tk_double);
-    Empty_Param tc_longdouble (CORBA::tk_longdouble);
-    Empty_Param tc_octet      (CORBA::tk_octet);
-    Empty_Param tc_any        (CORBA::tk_any);
-    Empty_Param tc_TypeCode   (CORBA::tk_TypeCode);
-    Empty_Param tc_Principal  (CORBA::tk_Principal);
-
-    // --------------
-
-    String<TAO::Null_RefCount_Policy> tc_string  (CORBA::tk_string, 0);
-    String<TAO::Null_RefCount_Policy> tc_wstring (CORBA::tk_wstring, 0);
-
-    // --------------
-
-    char const tc_object_id[]   = "IDL:omg.org/CORBA/Object:1.0";
-    char const tc_object_name[] = "Object";
-    Objref<char const *,
-           TAO::Null_RefCount_Policy> tc_Object (CORBA::tk_objref,
-                                                 tc_object_id,
-                                                 tc_object_name);
-
-    char const tc_component_id[]   = "IDL:omg.org/CORBA/CCMObject:1.0";
-    char const tc_component_name[] = "CCMObject";
-    Objref<char const *,
-           TAO::Null_RefCount_Policy> tc_Component (CORBA::tk_component,
-                                                    tc_component_id,
-                                                    tc_component_name);
-
-    char const tc_home_id[]   = "IDL:omg.org/CORBA/CCMHome:1.0";
-    char const tc_home_name[] = "CCMHome";
-    Objref<char const *,
-           TAO::Null_RefCount_Policy> tc_Home (CORBA::tk_home,
-                                               tc_home_id,
-                                               tc_home_name);
-  }  // End TypeCode namespace
-}  // End TAO namespace
-
-// ------------------------------------------------------------------
-// OMG defined TypeCode constants
-// ------------------------------------------------------------------
-
-namespace CORBA
-{
-  // Notice that these are constant TypeCode references/pointers, not
-  // constant TypeCodes.  TypeCodes are effectively read-only since
-  // all non-static TypeCode operations are const.
-
-  TypeCode_ptr const _tc_null       = &TAO::TypeCode::tc_null;
-  TypeCode_ptr const _tc_void       = &TAO::TypeCode::tc_void;
-  TypeCode_ptr const _tc_boolean    = &TAO::TypeCode::tc_boolean;
-  TypeCode_ptr const _tc_char       = &TAO::TypeCode::tc_char;
-  TypeCode_ptr const _tc_wchar      = &TAO::TypeCode::tc_wchar;
-  TypeCode_ptr const _tc_short      = &TAO::TypeCode::tc_short;
-  TypeCode_ptr const _tc_ushort     = &TAO::TypeCode::tc_ushort;
-  TypeCode_ptr const _tc_long       = &TAO::TypeCode::tc_long;
-  TypeCode_ptr const _tc_ulong      = &TAO::TypeCode::tc_ulong;
-  TypeCode_ptr const _tc_longlong   = &TAO::TypeCode::tc_longlong;
-  TypeCode_ptr const _tc_ulonglong  = &TAO::TypeCode::tc_ulonglong;
-  TypeCode_ptr const _tc_float      = &TAO::TypeCode::tc_float;
-  TypeCode_ptr const _tc_double     = &TAO::TypeCode::tc_double;
-  TypeCode_ptr const _tc_longdouble = &TAO::TypeCode::tc_longdouble;
-  TypeCode_ptr const _tc_octet      = &TAO::TypeCode::tc_octet;
-  TypeCode_ptr const _tc_any        = &TAO::TypeCode::tc_any;
-  TypeCode_ptr const _tc_TypeCode   = &TAO::TypeCode::tc_TypeCode;
-  TypeCode_ptr const _tc_Principal  = &TAO::TypeCode::tc_Principal;
-
-  TypeCode_ptr const _tc_string     = &TAO::TypeCode::tc_string;
-  TypeCode_ptr const _tc_wstring    = &TAO::TypeCode::tc_wstring;
-
-  TypeCode_ptr const _tc_Object     = &TAO::TypeCode::tc_Object;
-  TypeCode_ptr const _tc_Component  = &TAO::TypeCode::tc_Component;
-  TypeCode_ptr const _tc_Home       = &TAO::TypeCode::tc_Home;
-
-}
diff --git a/TAO/tao/TypeCode_Constants.h b/TAO/tao/TypeCode_Constants.h
deleted file mode 100644
index a5b29c32841..00000000000
--- a/TAO/tao/TypeCode_Constants.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   TypeCode_Constants.h
- *
- *  $Id$
- *
- *  Declare the @c TypeCode constants available to the ORB and user
- *  applications.
- *
- *  @author Jeff Parsons
- *  @author Ossama Othman
- */
-//=============================================================================
-
-#ifndef TAO_TYPECODE_CONSTANTS_H
-#define TAO_TYPECODE_CONSTANTS_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TAO_Export.h"
-
-namespace CORBA
-{
-  class TypeCode;
-  typedef TypeCode * TypeCode_ptr;
-
-  /**
-   * @name TypeCode Constants
-   *
-   * All the TypeCode constants
-   */
-  //@{
-  extern TAO_Export TypeCode_ptr const _tc_null;
-  extern TAO_Export TypeCode_ptr const _tc_void;
-  extern TAO_Export TypeCode_ptr const _tc_boolean;
-  extern TAO_Export TypeCode_ptr const _tc_char;
-  extern TAO_Export TypeCode_ptr const _tc_wchar;
-  extern TAO_Export TypeCode_ptr const _tc_short;
-  extern TAO_Export TypeCode_ptr const _tc_ushort;
-  extern TAO_Export TypeCode_ptr const _tc_long;
-  extern TAO_Export TypeCode_ptr const _tc_ulong;
-  extern TAO_Export TypeCode_ptr const _tc_longlong;
-  extern TAO_Export TypeCode_ptr const _tc_ulonglong;
-  extern TAO_Export TypeCode_ptr const _tc_float;
-  extern TAO_Export TypeCode_ptr const _tc_double;
-  extern TAO_Export TypeCode_ptr const _tc_longdouble;
-  extern TAO_Export TypeCode_ptr const _tc_octet;
-  extern TAO_Export TypeCode_ptr const _tc_any;
-  extern TAO_Export TypeCode_ptr const _tc_TypeCode;
-  extern TAO_Export TypeCode_ptr const _tc_Principal;
-
-  extern TAO_Export TypeCode_ptr const _tc_string;
-  extern TAO_Export TypeCode_ptr const _tc_wstring;
-
-  extern TAO_Export TypeCode_ptr const _tc_Object;
-  extern TAO_Export TypeCode_ptr const _tc_Component;
-  extern TAO_Export TypeCode_ptr const _tc_Home;
-  //@}
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_TYPECODE_CONSTANTS_H */
diff --git a/TAO/tao/TypeCode_Struct_Field.h b/TAO/tao/TypeCode_Struct_Field.h
deleted file mode 100644
index ad1fb0b35c2..00000000000
--- a/TAO/tao/TypeCode_Struct_Field.h
+++ /dev/null
@@ -1,89 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    TypeCode_Struct_Field.h
- *
- *  $Id$
- *
- *  Header file for @c TAO::TypeCode::Struct_Field type.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- *  @author Carlos O'Ryan
- */
-//=============================================================================
-
-#ifndef TAO_TYPECODE_STRUCT_FIELD_H
-#define TAO_TYPECODE_STRUCT_FIELD_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-namespace CORBA
-{
-  class TypeCode;
-  typedef TypeCode* TypeCode_ptr;
-}
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    /**
-     * @struct Struct_Field
-     *
-     * @brief Name/type pair for fields of an OMG IDL defined
-     *        structure or exception.
-     *
-     * A @c Struct_Field contains the corresponding name and pointer
-     * to the @c CORBA::TypeCode for a given OMG IDL defined type.
-     * For example, the fields in following OMG IDL structure:
-     *
-     * \code
-     *   struct Foo
-     *   {
-     *     long   the_number;
-     *     string the_string;
-     *   };
-     * \endcode
-     *
-     * would be represented using the following statically instantiated
-     * @c TAO::TypeCode::Struct_Field array:
-     *
-     * \code
-     *   TAO::TypeCode::Struct_Field<char const *> _tao_fields_Foo[] =
-     *     {
-     *       { "the_number", &CORBA::_tc_long },
-     *       { "the_string", &CORBA::_tc_string },
-     *     };
-     * \endcode
-     *
-     * The template parameter @a STRING_TYPE is either @c char
-     * @c const @c * or @c CORBA::String_var.  The latter is only used
-     * when creating @c CORBA::tk_struct or @c CORBA::tk_except
-     * @c TypeCodes dynamically, such as through the TypeCodeFactory.
-     */
-    template <typename StringType, typename TypeCodeType>
-    struct Struct_Field
-    {
-      /// The name of the field.
-      StringType name;
-
-      /// The @c CORBA::TypeCode of the field.
-      TypeCodeType type;
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_TYPECODE_STRUCT_FIELD_H */
diff --git a/TAO/tao/TypeCode_Traits.h b/TAO/tao/TypeCode_Traits.h
deleted file mode 100644
index b1eae5d2c13..00000000000
--- a/TAO/tao/TypeCode_Traits.h
+++ /dev/null
@@ -1,122 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    TypeCode_Traits.h
- *
- *  $Id$
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_TYPECODE_TRAITS_H
-#define TAO_TYPECODE_TRAITS_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/CORBA_String.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  class Null_RefCount_Policy;
-  class True_RefCount_Policy;
-
-  namespace TypeCode
-  {
-
-//     enum Storage { STATIC_TYPECODE, DYNAMIC_TYPECODE };
-
-//     template<Storage S> struct Traits;
-
-    // ----
-    // @@ Work around limitations in MSVC++ 6.
-    typedef char const * STATIC_TYPECODE;
-    typedef CORBA::String_var DYNAMIC_TYPECODE;
-
-    template<typename S> struct Traits;
-    // ----
-
-    template<>
-    struct Traits<STATIC_TYPECODE>
-    {
-      typedef char const * string_type;
-
-      /**
-       * A pointer to the @c CORBA::TypeCode_ptr rather than the
-       * @c CORBA::TypeCode_ptr itself is stored since that address is
-       * well-defined.  We may not know the value of the
-       * @c CORBA::TypeCode_ptr when creating a static object that
-       * refers to it, hence the indirection.
-       */
-      typedef CORBA::TypeCode_ptr const * typecode_type;
-
-      typedef TAO::Null_RefCount_Policy refcount_policy_type;
-
-      static char const * get_string (string_type const & str)
-      {
-        return str;
-      }
-
-      static CORBA::TypeCode_ptr get_typecode (typecode_type const & tc)
-      {
-        return (tc == 0 ? CORBA::TypeCode::_nil () : *tc);
-      }
-    };
-
-    template<>
-    struct Traits<DYNAMIC_TYPECODE>
-    {
-      typedef CORBA::String_var string_type;
-      typedef CORBA::TypeCode_var typecode_type;
-      typedef TAO::True_RefCount_Policy refcount_policy_type;
-
-      static char const * get_string (string_type const & str)
-      {
-        return str.in ();
-      }
-
-      static CORBA::TypeCode_ptr get_typecode (typecode_type const & tc)
-      {
-        return tc.in ();
-      }
-    };
-
-    // ---------------
-
-    // Traits based on TypeCode type template parameters.
-
-    template<>
-    struct Traits<Traits<STATIC_TYPECODE>::typecode_type>
-    {
-      typedef Traits<STATIC_TYPECODE>::typecode_type typecode_type;
-
-      static CORBA::TypeCode_ptr get_typecode (typecode_type const & tc)
-      {
-        return (tc == 0 ? CORBA::TypeCode::_nil () : *tc);
-      }
-    };
-
-    template<>
-    struct Traits<Traits<DYNAMIC_TYPECODE>::typecode_type>
-    {
-      typedef Traits<DYNAMIC_TYPECODE>::typecode_type typecode_type;
-
-      static CORBA::TypeCode_ptr get_typecode (typecode_type const & tc)
-      {
-        return tc.in ();
-      }
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_TYPECODE_TRAITS_H */
diff --git a/TAO/tao/TypeCode_Value_Field.h b/TAO/tao/TypeCode_Value_Field.h
deleted file mode 100644
index 7fbfcb20501..00000000000
--- a/TAO/tao/TypeCode_Value_Field.h
+++ /dev/null
@@ -1,91 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    TypeCode_Value_Field.h
- *
- *  $Id$
- *
- *  Header file for @c TAO::TypeCode::Value_Field type.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_TYPECODE_VALUE_FIELD_H
-#define TAO_TYPECODE_VALUE_FIELD_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-namespace CORBA
-{
-  class TypeCode;
-  typedef TypeCode* TypeCode_ptr;
-}
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    /**
-     * @struct Value_Field
-     *
-     * @brief Name/type/visibility tuple fields of an OMG IDL defined
-     *        @c valuetype or @c eventtype.
-     *
-     * A @c Value_Field contains the corresponding name and pointer to the
-     * @c CORBA::TypeCode for a given OMG IDL defined type.  For
-     * example, the fields in following OMG IDL structure:
-     *
-     * \code
-     *   struct Foo
-     *   {
-     *     long   the_number;
-     *     string the_string;
-     *   };
-     * \endcode
-     *
-     * would be represented using the following statically instantiated
-     * @c TAO::TypeCode::Value_Field array:
-     *
-     * \code
-     *   TAO::TypeCode::Value_Field<char const *> _tao_fields_Foo[] =
-     *     {
-     *       { "the_number", &CORBA::_tc_long },
-     *       { "the_string", &CORBA::_tc_string },
-     *     };
-     * \endcode
-     *
-     * The template parameter @a STRING_TYPE is either @c char
-     * @c const @c * or @c CORBA::String_var.  The latter is only used
-     * when creating @c CORBA::tk_value or @c CORBA::tk_event
-     * @c TypeCodes dynamically, such as through the TypeCodeFactory.
-     */
-    template <typename StringType, typename TypeCodeType>
-    struct Value_Field
-    {
-      /// The name of the field.
-      StringType name;
-
-      /// The @c CORBA::TypeCode of the field.
-      TypeCodeType type;
-
-      /// The visibility of the field.
-      CORBA::Visibility visibility;
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_TYPECODE_VALUE_FIELD_H */
diff --git a/TAO/tao/UB_String_Argument_T.cpp b/TAO/tao/UB_String_Argument_T.cpp
index a22d029b64c..a84a261ed85 100644
--- a/TAO/tao/UB_String_Argument_T.cpp
+++ b/TAO/tao/UB_String_Argument_T.cpp
@@ -4,50 +4,46 @@
 #define TAO_UB_STRING_ARGUMENT_T_C
 
 #include "tao/UB_String_Argument_T.h"
-#include "tao/Dynamic_ParameterC.h"
 #include "tao/CDR.h"
 
 #if !defined (__ACE_INLINE__)
 #include "tao/UB_String_Argument_T.inl"
 #endif /* __ACE_INLINE__ */
 
-//#include "tao/DynamicC.h"
-
 ACE_RCSID (tao,
            UB_String_Argument_T,
            "$Id$")
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 CORBA::Boolean
-TAO::In_UB_String_Argument_T<S>::marshal (TAO_OutputCDR & cdr)
+TAO::In_UB_String_Argument_T<S,Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << this->x_;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 void
-TAO::In_UB_String_Argument_T<S>::interceptor_param (Dynamic::Parameter & p)
+TAO::In_UB_String_Argument_T<S,Insert_Policy>::interceptor_value (CORBA::Any *any) const
 {
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_IN;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ===========================================================
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_UB_String_Argument_T<S>::marshal (TAO_OutputCDR & cdr)
+TAO::Inout_UB_String_Argument_T<S,Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << this->x_;
 }
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_UB_String_Argument_T<S>::demarshal (TAO_InputCDR & cdr)
+TAO::Inout_UB_String_Argument_T<S,Insert_Policy>::demarshal (TAO_InputCDR & cdr)
 {
   delete [] this->x_;
   return cdr >> this->x_;
@@ -55,55 +51,53 @@ TAO::Inout_UB_String_Argument_T<S>::demarshal (TAO_InputCDR & cdr)
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 void
-TAO::Inout_UB_String_Argument_T<S>::interceptor_param (Dynamic::Parameter & p)
+TAO::Inout_UB_String_Argument_T<S,Insert_Policy>::interceptor_value (CORBA::Any *any) const
 {
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_INOUT;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ==============================================================
 
-template<typename S, typename S_out>
+template<typename S, typename S_out, typename Insert_Policy>
 CORBA::Boolean
-TAO::Out_UB_String_Argument_T<S,S_out>::demarshal (TAO_InputCDR & cdr)
+TAO::Out_UB_String_Argument_T<S,S_out,Insert_Policy>::demarshal (TAO_InputCDR & cdr)
 {
   return cdr >> this->x_;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, typename S_out>
+template<typename S, typename S_out, typename Insert_Policy>
 void
-TAO::Out_UB_String_Argument_T<S,S_out>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::Out_UB_String_Argument_T<S,S_out,Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_OUT;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ============================================================
 
-template<typename S, typename S_var>
+template<typename S, typename S_var, typename Insert_Policy>
 CORBA::Boolean
-TAO::Ret_UB_String_Argument_T<S,S_var>::demarshal (TAO_InputCDR & cdr)
+TAO::Ret_UB_String_Argument_T<S,S_var,Insert_Policy>::demarshal (TAO_InputCDR & cdr)
 {
   return cdr >> this->x_.out ();
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, typename S_var>
+template<typename S, typename S_var, typename Insert_Policy>
 void
-TAO::Ret_UB_String_Argument_T<S,S_var>::interceptor_result (CORBA::Any * any)
+TAO::Ret_UB_String_Argument_T<S,S_var,Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  (*any) <<= this->x_.in ();
+  this->Insert_Policy::any_insert (any, this->x_.in ());
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
diff --git a/TAO/tao/UB_String_Argument_T.h b/TAO/tao/UB_String_Argument_T.h
index 02c1c948b6c..2b4b3d25214 100644
--- a/TAO/tao/UB_String_Argument_T.h
+++ b/TAO/tao/UB_String_Argument_T.h
@@ -29,15 +29,15 @@ namespace TAO
    * @brief Template class for IN unbounded (w)string argument.
    *
    */
-  template<typename S>
-  class In_UB_String_Argument_T : public Argument
+  template<typename S, typename Insert_Policy>
+  class In_UB_String_Argument_T : public InArgument, private Insert_Policy
   {
   public:
     In_UB_String_Argument_T (const S * x);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S const * arg (void) const;
 
@@ -51,16 +51,16 @@ namespace TAO
    * @brief Template class for INOUT unbounded (w)string argument.
    *
    */
-  template<typename S>
-  class Inout_UB_String_Argument_T : public Argument
+  template<typename S, typename Insert_Policy>
+  class Inout_UB_String_Argument_T : public InoutArgument, private Insert_Policy
   {
   public:
     Inout_UB_String_Argument_T (S *& x);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S *& arg (void);
 
@@ -71,18 +71,18 @@ namespace TAO
   /**
    * @class Out_UB_String_Argument_T
    *
-   * @brief Template class for INOUT unbounded (w)string argument.
+   * @brief Template class for OUT unbounded (w)string argument.
    *
    */
-  template<typename S, typename S_out>
-  class Out_UB_String_Argument_T : public Argument
+  template<typename S, typename S_out, typename Insert_Policy>
+  class Out_UB_String_Argument_T : public OutArgument, private Insert_Policy
   {
   public:
     Out_UB_String_Argument_T (S_out & x);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S *& arg (void);
 
@@ -96,15 +96,15 @@ namespace TAO
    * @brief Template class for return stub value of ub (w)string argument.
    *
    */
-  template<typename S, typename S_var>
-  class Ret_UB_String_Argument_T : public Argument
+  template<typename S, typename S_var, typename Insert_Policy>
+  class Ret_UB_String_Argument_T : public RetArgument, private Insert_Policy
   {
   public:
     Ret_UB_String_Argument_T (void);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_result (CORBA::Any *);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S *& arg (void);
 
@@ -129,20 +129,20 @@ namespace TAO
    * @brief Template class for argument traits of unbounded (w)strings.
    *
    */
-  template<typename T, typename T_var, typename T_out>
+  template<typename T, typename T_var, typename T_out, typename Insert_Policy>
   struct UB_String_Arg_Traits_T
   {
-    typedef T *                                         ret_type;
-    typedef T const *                                   in_type;
-    typedef T *&                                        inout_type;
-    typedef T_out                                       out_type;
+    typedef T *                                              ret_type;
+    typedef T const *                                        in_type;
+    typedef T *&                                             inout_type;
+    typedef T_out                                            out_type;
 
-    typedef In_UB_String_Argument_T<T>                  in_arg_val;
-    typedef Inout_UB_String_Argument_T<T>               inout_arg_val;
-    typedef Out_UB_String_Argument_T<T,T_out>           out_arg_val;
-    typedef Ret_UB_String_Argument_T<T,T_var>           ret_val;
+    typedef In_UB_String_Argument_T<T, Insert_Policy>        in_arg_val;
+    typedef Inout_UB_String_Argument_T<T, Insert_Policy>     inout_arg_val;
+    typedef Out_UB_String_Argument_T<T,T_out, Insert_Policy> out_arg_val;
+    typedef Ret_UB_String_Argument_T<T,T_var, Insert_Policy> ret_val;
 
-    typedef UB_String_Tag                               idl_tag;
+    typedef UB_String_Tag                                    idl_tag;
   };
 }
 
diff --git a/TAO/tao/UB_String_Argument_T.inl b/TAO/tao/UB_String_Argument_T.inl
index b5fbd2a4b60..b6f6a97db6e 100644
--- a/TAO/tao/UB_String_Argument_T.inl
+++ b/TAO/tao/UB_String_Argument_T.inl
@@ -1,78 +1,78 @@
 // $Id$
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 ACE_INLINE
-TAO::In_UB_String_Argument_T<S>::In_UB_String_Argument_T (const S * x)
+TAO::In_UB_String_Argument_T<S,Insert_Policy>::In_UB_String_Argument_T (const S * x)
   : x_ (x)
 {}
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 ACE_INLINE
 const S *
-TAO::In_UB_String_Argument_T<S>::arg (void) const
+TAO::In_UB_String_Argument_T<S,Insert_Policy>::arg (void) const
 {
   return this->x_;
 }
 
 // ==========================================================================
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 ACE_INLINE
-TAO::Inout_UB_String_Argument_T<S>::Inout_UB_String_Argument_T (S *& x)
+TAO::Inout_UB_String_Argument_T<S,Insert_Policy>::Inout_UB_String_Argument_T (S *& x)
   : x_ (x)
 {}
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 ACE_INLINE
 S *&
-TAO::Inout_UB_String_Argument_T<S>::arg (void)
+TAO::Inout_UB_String_Argument_T<S,Insert_Policy>::arg (void)
 {
   return this->x_;
 }
 
 // ==========================================================================
 
-template<typename S, typename S_out>
+template<typename S, typename S_out, typename Insert_Policy>
 ACE_INLINE
-TAO::Out_UB_String_Argument_T<S,S_out>::Out_UB_String_Argument_T (S_out & x)
+TAO::Out_UB_String_Argument_T<S,S_out,Insert_Policy>::Out_UB_String_Argument_T (S_out & x)
   : x_ (x.ptr ())
 {}
 
-template<typename S, typename S_out>
+template<typename S, typename S_out, typename Insert_Policy>
 ACE_INLINE
 S *&
-TAO::Out_UB_String_Argument_T<S,S_out>::arg (void)
+TAO::Out_UB_String_Argument_T<S,S_out,Insert_Policy>::arg (void)
 {
   return this->x_;
 }
 
 // ==========================================================================
 
-template<typename S, typename S_var>
+template<typename S, typename S_var, typename Insert_Policy>
 ACE_INLINE
-TAO::Ret_UB_String_Argument_T<S,S_var>::Ret_UB_String_Argument_T (void)
+TAO::Ret_UB_String_Argument_T<S,S_var,Insert_Policy>::Ret_UB_String_Argument_T (void)
 {}
 
-template<typename S, typename S_var>
+template<typename S, typename S_var, typename Insert_Policy>
 ACE_INLINE
 S *&
-TAO::Ret_UB_String_Argument_T<S,S_var>::arg (void)
+TAO::Ret_UB_String_Argument_T<S,S_var,Insert_Policy>::arg (void)
 {
   return this->x_.out ();
 }
 
-template<typename S, typename S_var>
+template<typename S, typename S_var, typename Insert_Policy>
 ACE_INLINE
 S *
-TAO::Ret_UB_String_Argument_T<S,S_var>::excp (void)
+TAO::Ret_UB_String_Argument_T<S,S_var,Insert_Policy>::excp (void)
 {
   return this->x_.ptr ();
 }
 
-template<typename S, typename S_var>
+template<typename S, typename S_var, typename Insert_Policy>
 ACE_INLINE
 S *
-TAO::Ret_UB_String_Argument_T<S,S_var>::retn (void)
+TAO::Ret_UB_String_Argument_T<S,S_var,Insert_Policy>::retn (void)
 {
   return this->x_._retn ();
 }
diff --git a/TAO/tao/UB_String_Arguments.h b/TAO/tao/UB_String_Arguments.h
index 9da4c15be57..a5268d9a6d2 100644
--- a/TAO/tao/UB_String_Arguments.h
+++ b/TAO/tao/UB_String_Arguments.h
@@ -22,6 +22,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/Arg_Traits_T.h"
+#include "tao/Any_Insert_Policy_T.h"
 
 namespace TAO
 {
@@ -35,7 +36,8 @@ namespace TAO
   class TAO_Export Arg_Traits<CORBA::Char *>
     : public UB_String_Arg_Traits_T<CORBA::Char,
                                     CORBA::String_var,
-                                    CORBA::String_out>
+                                    CORBA::String_out,
+                                    TAO::Any_Insert_Policy_AnyTypeCode_Adapter <CORBA::Char const *> >
   {
   };
 
@@ -43,7 +45,8 @@ namespace TAO
   class TAO_Export Arg_Traits<CORBA::WChar *>
     : public UB_String_Arg_Traits_T<CORBA::WChar,
                                     CORBA::WString_var,
-                                    CORBA::WString_out>
+                                    CORBA::WString_out,
+                                    TAO::Any_Insert_Policy_AnyTypeCode_Adapter <CORBA::WChar const *> >
   {
   };
 }
diff --git a/TAO/tao/ULongLongSeqA.cpp b/TAO/tao/ULongLongSeqA.cpp
deleted file mode 100644
index 2144f0d1b09..00000000000
--- a/TAO/tao/ULongLongSeqA.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-// -*- 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/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "ULongLongSeqC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_CORBA_ULongLongSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ULongLongSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ULongLongSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_ulonglong,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ULongLongSeq_0 =
-      &CORBA_ULongLongSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ULongLongSeq_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ULongLongSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ULongLongSeq:1.0",
-    "ULongLongSeq",
-    &TAO::TypeCode::tc_CORBA_ULongLongSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ULongLongSeq =
-    &_tao_tc_CORBA_ULongLongSeq;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ULongLongSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ULongLongSeq>::insert_copy (
-      _tao_any,
-      CORBA::ULongLongSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ULongLongSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ULongLongSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ULongLongSeq>::insert (
-      _tao_any,
-      CORBA::ULongLongSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ULongLongSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ULongLongSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ULongLongSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ULongLongSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ULongLongSeq>::extract (
-        _tao_any,
-        CORBA::ULongLongSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ULongLongSeq_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/ULongLongSeqC.cpp b/TAO/tao/ULongLongSeqC.cpp
index 6d9deb8b3e6..69cc5082433 100644
--- a/TAO/tao/ULongLongSeqC.cpp
+++ b/TAO/tao/ULongLongSeqC.cpp
@@ -26,16 +26,12 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
 #include "ULongLongSeqC.h"
 #include "tao/CDR.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
diff --git a/TAO/tao/ULongLongSeqC.h b/TAO/tao/ULongLongSeqC.h
index b00d1dea657..523aaaee8f1 100644
--- a/TAO/tao/ULongLongSeqC.h
+++ b/TAO/tao/ULongLongSeqC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_ULONGLONGSEQC_H_
-#define _TAO_IDL_ORIG_ULONGLONGSEQC_H_
+#ifndef _TAO_IDL_ULONGLONGSEQC_H_
+#define _TAO_IDL_ULONGLONGSEQC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -52,17 +52,8 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#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
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace CORBA
 {
@@ -114,14 +105,9 @@ namespace CORBA
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ULongLongSeq;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module CORBA
 
@@ -134,14 +120,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::ULongLongSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::ULongLongSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ULongLongSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ULongLongSeq *&);
-
-// TAO_IDL - Generated from
 // be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_CORBA_ULongLongSeq_H_
@@ -159,15 +137,7 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_ULongLongSeq_H_ */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+// be\be_codegen.cpp:1028
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/ULongSeqA.cpp b/TAO/tao/ULongSeqA.cpp
deleted file mode 100644
index e3b8a0b711f..00000000000
--- a/TAO/tao/ULongSeqA.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-// -*- 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/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "ULongSeqC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_CORBA_ULongSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ULongSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ULongSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_ulong,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ULongSeq_0 =
-      &CORBA_ULongSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ULongSeq_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ULongSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ULongSeq:1.0",
-    "ULongSeq",
-    &TAO::TypeCode::tc_CORBA_ULongSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ULongSeq =
-    &_tao_tc_CORBA_ULongSeq;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ULongSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ULongSeq>::insert_copy (
-      _tao_any,
-      CORBA::ULongSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ULongSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ULongSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ULongSeq>::insert (
-      _tao_any,
-      CORBA::ULongSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ULongSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ULongSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ULongSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ULongSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ULongSeq>::extract (
-        _tao_any,
-        CORBA::ULongSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ULongSeq_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/ULongSeqC.cpp b/TAO/tao/ULongSeqC.cpp
index 76df5c16bb5..8fc6a35358a 100644
--- a/TAO/tao/ULongSeqC.cpp
+++ b/TAO/tao/ULongSeqC.cpp
@@ -26,16 +26,12 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:288
 
 
 #include "ULongSeqC.h"
 #include "tao/CDR.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
diff --git a/TAO/tao/ULongSeqC.h b/TAO/tao/ULongSeqC.h
index 31621d2d610..07d71927c92 100644
--- a/TAO/tao/ULongSeqC.h
+++ b/TAO/tao/ULongSeqC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_ULONGSEQC_H_
-#define _TAO_IDL_ORIG_ULONGSEQC_H_
+#ifndef _TAO_IDL_ULONGSEQC_H_
+#define _TAO_IDL_ULONGSEQC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -57,12 +57,8 @@
 #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
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace CORBA
 {
@@ -114,14 +110,9 @@ namespace CORBA
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ULongSeq;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module CORBA
 
@@ -134,14 +125,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::ULongSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::ULongSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ULongSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ULongSeq *&);
-
-// TAO_IDL - Generated from
 // be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_CORBA_ULongSeq_H_
@@ -159,16 +142,12 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_ULongSeq_H_ */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
+// be\be_codegen.cpp:1062
 
 #if defined(_MSC_VER)
 #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/UShortSeqA.cpp b/TAO/tao/UShortSeqA.cpp
deleted file mode 100644
index 6259a96e1f9..00000000000
--- a/TAO/tao/UShortSeqA.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-// -*- 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/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "UShortSeqC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_CORBA_UShortSeq_GUARD
-#define _TAO_TYPECODE_CORBA_UShortSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_UShortSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_ushort,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_UShortSeq_0 =
-      &CORBA_UShortSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_UShortSeq_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_UShortSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/UShortSeq:1.0",
-    "UShortSeq",
-    &TAO::TypeCode::tc_CORBA_UShortSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_UShortSeq =
-    &_tao_tc_CORBA_UShortSeq;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::UShortSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::UShortSeq>::insert_copy (
-      _tao_any,
-      CORBA::UShortSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_UShortSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::UShortSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::UShortSeq>::insert (
-      _tao_any,
-      CORBA::UShortSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_UShortSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::UShortSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::UShortSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::UShortSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::UShortSeq>::extract (
-        _tao_any,
-        CORBA::UShortSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_UShortSeq_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/UShortSeqC.h b/TAO/tao/UShortSeqC.h
index c7f63e0258a..33567017495 100644
--- a/TAO/tao/UShortSeqC.h
+++ b/TAO/tao/UShortSeqC.h
@@ -66,22 +66,22 @@
 
 namespace CORBA
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_USHORTSEQ_CH_)
 #define _CORBA_USHORTSEQ_CH_
-  
+
   class UShortSeq;
-  
+
   typedef
     TAO_FixedSeq_Var_T<
         UShortSeq,
         CORBA::UShort
       >
     UShortSeq_var;
-  
+
   typedef
     TAO_Seq_Out_T<
         UShortSeq,
@@ -89,7 +89,7 @@ namespace CORBA
         CORBA::UShort
       >
     UShortSeq_out;
-  
+
   class TAO_Export UShortSeq
     : public
         TAO_Unbounded_Sequence<
@@ -102,23 +102,18 @@ namespace CORBA
     UShortSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        CORBA::UShort* buffer, 
+        CORBA::UShort* buffer,
         CORBA::Boolean release = 0
       );
     UShortSeq (const UShortSeq &);
     ~UShortSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef UShortSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_UShortSeq;
 
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:66
@@ -146,14 +141,6 @@ namespace TAO
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::UShortSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::UShortSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::UShortSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::UShortSeq *&);
-
-// TAO_IDL - Generated from
 // be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_CORBA_UShortSeq_H_
diff --git a/TAO/tao/Union_TypeCode.cpp b/TAO/tao/Union_TypeCode.cpp
deleted file mode 100644
index 09f2d66958e..00000000000
--- a/TAO/tao/Union_TypeCode.cpp
+++ /dev/null
@@ -1,440 +0,0 @@
-// $Id$
-
-#ifndef TAO_UNION_TYPECODE_CPP
-#define TAO_UNION_TYPECODE_CPP
-
-#include "tao/Union_TypeCode.h"
-#include "tao/TypeCode_Case.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/Union_TypeCode.inl"
-#endif  /* !__ACE_INLINE__ */
-
-#include "tao/SystemException.h"
-
-#include "ace/Value_Ptr.h"
-
-
-template <typename StringType,
-          typename TypeCodeType,
-          class CaseArrayType,
-          class RefCountPolicy>
-bool
-TAO::TypeCode::Union<StringType,
-                     TypeCodeType,
-                     CaseArrayType,
-                     RefCountPolicy>::tao_marshal (
-  TAO_OutputCDR & cdr,
-  CORBA::ULong offset) const
-{
-  // A tk_union TypeCode has a "complex" parameter list type (see
-  // Table 15-2 in Section 15.3.5.1 "TypeCode" in the CDR section of
-  // the CORBA specification), meaning that it must be marshaled into
-  // a CDR encapsulation.
-
-  // Create a CDR encapsulation.
-  TAO_OutputCDR enc;
-
-  bool const success =
-    (enc << TAO_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER))
-    && (enc << TAO_OutputCDR::from_string (this->base_attributes_.id (), 0))
-    && (enc << TAO_OutputCDR::from_string (this->base_attributes_.name (), 0))
-    && marshal (enc,
-                Traits<StringType>::get_typecode (this->discriminant_type_),
-                offset + enc.total_length ())
-    && (enc << this->default_index_)
-    && (enc << this->ncases_);
-
-  if (!success)
-    return false;
-
-  for (CORBA::ULong i = 0; i < this->ncases_; ++i)
-    {
-      case_type const & c = *this->cases_[i];
-
-      if (!c.marshal (enc, offset + enc.total_length ()))
-        return false;
-    }
-
-  return
-    cdr << static_cast<CORBA::ULong> (enc.total_length ())
-    && cdr.write_octet_array_mb (enc.begin ());
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class CaseArrayType,
-          class RefCountPolicy>
-void
-TAO::TypeCode::Union<StringType,
-                     TypeCodeType,
-                     CaseArrayType,
-                     RefCountPolicy>::tao_duplicate (void)
-{
-  this->RefCountPolicy::add_ref ();
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class CaseArrayType,
-          class RefCountPolicy>
-void
-TAO::TypeCode::Union<StringType,
-                     TypeCodeType,
-                     CaseArrayType,
-                     RefCountPolicy>::tao_release (void)
-{
-  this->RefCountPolicy::remove_ref ();
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class CaseArrayType,
-          class RefCountPolicy>
-CORBA::Boolean
-TAO::TypeCode::Union<StringType,
-                     TypeCodeType,
-                     CaseArrayType,
-                     RefCountPolicy>::equal_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // These calls shouldn't throw since CORBA::TypeCode::equal()
-  // verified that the TCKind is the same as our's prior to invoking
-  // this method, meaning that the CORBA::tk_union TypeCode methods
-  // are supported.
-
-  CORBA::ULong const tc_count =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Long tc_def = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (tc_count != this->ncases_
-      || tc_def != this->default_index_)
-    return 0;
-
-  // Check the discriminator type.
-  CORBA::TypeCode_var tc_discriminator =
-    tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Boolean const equal_discriminators =
-    Traits<StringType>::get_typecode (this->discriminant_type_)->equal (
-      tc_discriminator.in ()
-      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (!equal_discriminators)
-    return 0;
-
-  for (CORBA::ULong i = 0; i < this->ncases_; ++i)
-    {
-      if (this->default_index_ > -1
-          && static_cast<CORBA::ULong> (this->default_index_) == i)
-        {
-          // Don't bother checking equality of default case label.  It
-          // will always be the zero octet (the CDR encoded value is
-          // ignored).
-          continue;
-        }
-
-      case_type const & lhs_case = *this->cases_[i];
-
-      bool const equal_case =
-        lhs_case.equal (i,
-                        tc
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (!equal_case)
-        return 0;
-    }
-
-  return 1;
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class CaseArrayType,
-          class RefCountPolicy>
-CORBA::Boolean
-TAO::TypeCode::Union<StringType,
-                     TypeCodeType,
-                     CaseArrayType,
-                     RefCountPolicy>::equivalent_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // Perform a structural comparison, excluding the name() and
-  // member_name() operations.
-
-  CORBA::ULong const tc_count =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Long tc_def = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (tc_count != this->ncases_
-      || tc_def != this->default_index_)
-    return 0;
-
-  CORBA::TypeCode_var tc_discriminator =
-    tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Boolean const equiv_discriminators =
-    Traits<StringType>::get_typecode (this->discriminant_type_)->equivalent (
-      tc_discriminator.in ()
-      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (!equiv_discriminators)
-    return 0;
-
-  for (CORBA::ULong i = 0; i < this->ncases_; ++i)
-    {
-      if (this->default_index_ > -1
-          && static_cast<CORBA::ULong> (this->default_index_) == i)
-        {
-          // Don't bother checking equality/equivalence of default
-          // case label.  It will always be the zero octet (the CDR
-          // encoded value is ignored).
-          continue;
-        }
-
-      case_type const & lhs_case = *this->cases_[i];
-
-      bool const equivalent_case =
-        lhs_case.equivalent (i,
-                             tc
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (!equivalent_case)
-        return 0;
-    }
-
-  return 1;
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class CaseArrayType,
-          class RefCountPolicy>
-CORBA::TypeCode_ptr
-TAO::TypeCode::Union<StringType,
-                     TypeCodeType,
-                     CaseArrayType,
-                     RefCountPolicy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
-{
-//   typedef ACE::Value_Ptr<TAO::TypeCode::Case<CORBA::String_var,
-//                                              CORBA::TypeCode_var> > elem_type;
-
-//   ACE_Array_Base<elem_type> tc_cases (this->ncases_);
-
-//   if (this->ncases_ > 0)
-//     {
-//       // Dynamically construct a new array of cases stripped of
-//       // member names.
-
-//       static char const empty_name[] = "";
-
-//       for (CORBA::ULong i = 0; i < this->ncases_; ++i)
-//         {
-//           // Member names will be stripped, i.e. not embedded within
-//           // the compact TypeCode.
-//           tc_cases[i].name = empty_name;
-//           tc_cases[i].type =
-//             this->cases_[i]->type ()->get_compact_typecode (
-//               ACE_ENV_ARG_PARAMETER);
-//           ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-//         }
-//     }
-
-//   // Create the compact union TypeCode.
-//   TAO_TypeCodeFactory_Adapter * adapter =
-//     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-//       TAO_ORB_Core::typecodefactory_adapter_name ());
-
-//   if (adapter == 0)
-//     {
-//       ACE_THROW_RETURN (CORBA::INTERNAL (),
-//                         CORBA::TypeCode::_nil ());
-//     }
-
-//   return
-//     adapter->create_union_tc (
-//       this->base_attributes_.id (),
-//       "",  /* empty name */
-//       Traits<StringType>::get_typecode (this->discriminant_type_),
-//       tc_cases,
-//       this->ncases_,
-//       this->default_index_,
-//       "",
-//       Traits<StringType>::get_typecode (this->default_case_.type)
-//       ACE_ENV_ARG_PARAMETER);
-//   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::TypeCode::_nil ());
-    
-  ACE_NOTREACHED (return CORBA::TypeCode::_nil ());
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class CaseArrayType,
-          class RefCountPolicy>
-char const *
-TAO::TypeCode::Union<StringType,
-                     TypeCodeType,
-                     CaseArrayType,
-                     RefCountPolicy>::id_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->base_attributes_.id ();
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class CaseArrayType,
-          class RefCountPolicy>
-char const *
-TAO::TypeCode::Union<StringType,
-                     TypeCodeType,
-                     CaseArrayType,
-                     RefCountPolicy>::name_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->base_attributes_.name ();
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class CaseArrayType,
-          class RefCountPolicy>
-CORBA::ULong
-TAO::TypeCode::Union<StringType,
-                     TypeCodeType,
-                      CaseArrayType,
-                      RefCountPolicy>::member_count_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->ncases_;
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class CaseArrayType,
-          class RefCountPolicy>
-char const *
-TAO::TypeCode::Union<StringType,
-                     TypeCodeType,
-                     CaseArrayType,
-                     RefCountPolicy>::member_name_i (CORBA::ULong index
-                                                     ACE_ENV_ARG_DECL) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  if (index >= this->ncases_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
-
-  return this->cases_[index]->name ();
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class CaseArrayType,
-          class RefCountPolicy>
-CORBA::TypeCode_ptr
-TAO::TypeCode::Union<StringType,
-                     TypeCodeType,
-                     CaseArrayType,
-                     RefCountPolicy>::member_type_i (CORBA::ULong index
-                                                     ACE_ENV_ARG_DECL) const
-{
-  if (index >= this->ncases_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
-                      CORBA::TypeCode::_nil ());
-
-  return CORBA::TypeCode::_duplicate (this->cases_[index]->type ());
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class CaseArrayType,
-          class RefCountPolicy>
-CORBA::Any *
-TAO::TypeCode::Union<StringType,
-                     TypeCodeType,
-                     CaseArrayType,
-                     RefCountPolicy>::member_label_i (CORBA::ULong index
-                                                      ACE_ENV_ARG_DECL) const
-{
-  if (index >= this->ncases_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
-                      0);
-
-  // Default case.
-  if (this->default_index_ > -1
-      && static_cast<CORBA::ULong> (this->default_index_) == index)
-    {
-      CORBA::Any * any;
-      ACE_NEW_THROW_EX (any,
-                        CORBA::Any,
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (0);
-
-      CORBA::Any_var safe_any (any);
-
-      // Default case's label is a zero octet.
-      CORBA::Any::from_octet const zero_octet (0);
-
-      // Default case/member has a zero octet label value.
-      (*any) <<= zero_octet;
-
-      return safe_any._retn ();
-    }
-
-  // Non-default cases.
-  return this->cases_[index]->label (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class CaseArrayType,
-          class RefCountPolicy>
-CORBA::TypeCode_ptr
-TAO::TypeCode::Union<StringType,
-                     TypeCodeType,
-                     CaseArrayType,
-                     RefCountPolicy>::discriminator_type_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return
-    CORBA::TypeCode::_duplicate (
-      Traits<StringType>::get_typecode (this->discriminant_type_));
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class CaseArrayType,
-          class RefCountPolicy>
-CORBA::Long
-TAO::TypeCode::Union<StringType,
-                     TypeCodeType,
-                     CaseArrayType,
-                     RefCountPolicy>::default_index_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->default_index_;
-}
-
-#endif  /* TAO_UNION_TYPECODE_CPP */
diff --git a/TAO/tao/Union_TypeCode.h b/TAO/tao/Union_TypeCode.h
deleted file mode 100644
index 6890f3776a5..00000000000
--- a/TAO/tao/Union_TypeCode.h
+++ /dev/null
@@ -1,179 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Union_TypeCode.h
- *
- *  $Id$
- *
- *  Header file for a @c tk_union CORBA::TypeCode.
- *
- *  @author Ossama Othman
- */
-//=============================================================================
-
-#ifndef TAO_UNION_TYPECODE_H
-#define TAO_UNION_TYPECODE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TypeCode.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TypeCode_Base_Attributes.h"
-
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-
-    /**
-     * @class Union
-     *
-     * @brief @c CORBA::TypeCode implementation for an OMG IDL
-     *        @c union.
-     *
-     * This class implements a @c CORBA::TypeCode for an OMG IDL
-     * @c union.
-     */
-    template <typename StringType,
-              typename TypeCodeType,
-              class CaseArrayType,
-              class RefCountPolicy>
-    class Union
-      : public CORBA::TypeCode,
-        private RefCountPolicy
-    {
-    public:
-
-      /// @typedef Type of individual case array element, not the
-      ///          array itself.
-      typedef TAO::TypeCode::Case<StringType, TypeCodeType> case_type;
-
-      /// Constructor.
-      Union (char const * id,
-             char const * name,
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x572)
-             // Borland C++ currently can't handle a reference to
-             // const pointer to const CORBA::TypeCode_ptr
-             TypeCodeType discriminant_type,
-#else
-             TypeCodeType const & discriminant_type,
-#endif
-             CaseArrayType const & cases,
-             CORBA::ULong ncases,
-             CORBA::Long default_index);
-
-      /// Constructor used for recursive TypeCodes.
-      Union (CORBA::TCKind kind,
-             char const * id);
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
-      //@}
-
-    protected:
-
-      /**
-       * @name @c TAO CORBA::TypeCode Template Methods
-       *
-       * @c tk_union @c CORBA::TypeCode -specific template methods.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * member_name_i (CORBA::ULong index
-                                          ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index
-                                                 ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Any * member_label_i (CORBA::ULong index
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr discriminator_type_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::Long default_index_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      //@}
-
-    protected:
-
-      /**
-       * @c Union Attributes
-       *
-       * Attributes representing the structure of an OMG IDL
-       * @c union.
-       *
-       * @note These attributes are declared in the order in which
-       *       they are marshaled into a CDR stream in order to
-       *       increase cache hits by improving spatial locality.
-       */
-      //@{
-
-      /// Base attributes containing repository ID and name of
-      /// union type.
-      Base_Attributes<StringType> base_attributes_;
-
-      /// Type of IDL @c union discriminant.
-      TypeCodeType discriminant_type_;
-
-      /// Index of the default union case.
-      /**
-       * This value will be -1 if no default case is found in the
-       * union.
-       */
-      CORBA::Long default_index_;
-
-      /// The number of cases in the OMG IDL union, excluding the
-      /// @c default case.
-      CORBA::ULong ncases_;
-
-      /// Array of @c TAO::TypeCode::Case representing structure of
-      /// the OMG IDL defined @c union.
-      CaseArrayType cases_;
-
-      //@}
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/Union_TypeCode.inl"
-#endif  /* __ACE_INLINE__ */
-
-#ifdef ACE_TEMPLATES_REQUIRE_SOURCE
-# include "tao/Union_TypeCode.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
-# pragma implementation ("Union_TypeCode.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_UNION_TYPECODE_H */
diff --git a/TAO/tao/Union_TypeCode.inl b/TAO/tao/Union_TypeCode.inl
deleted file mode 100644
index 84dfb32fa0b..00000000000
--- a/TAO/tao/Union_TypeCode.inl
+++ /dev/null
@@ -1,55 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-template <typename StringType,
-          typename TypeCodeType,
-          class CaseArrayType,
-          class RefCountPolicy>
-ACE_INLINE
-TAO::TypeCode::Union<StringType,
-                     TypeCodeType,
-                     CaseArrayType,
-                     RefCountPolicy>::Union (
-  char const * id,
-  char const * name,
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x572)
-  // Borland C++ currently can't handle a reference to
-  // const pointer to const CORBA::TypeCode_ptr
-  TypeCodeType discriminant_type,
-#else
-  TypeCodeType const & discriminant_type,
-#endif
-  CaseArrayType const & cases,
-  CORBA::ULong ncases,
-  CORBA::Long default_index)
-  : CORBA::TypeCode (CORBA::tk_union)
-  , RefCountPolicy ()
-  , base_attributes_ (id, name)
-  , discriminant_type_ (discriminant_type)
-  , default_index_ (default_index)
-  , ncases_ (ncases)
-  , cases_ (cases)
-{
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class CaseArrayType,
-          class RefCountPolicy>
-ACE_INLINE
-TAO::TypeCode::Union<StringType,
-                     TypeCodeType,
-                     CaseArrayType,
-                     RefCountPolicy>::Union (
-  CORBA::TCKind,
-  char const * id)
-  : CORBA::TypeCode (CORBA::tk_union)
-  , RefCountPolicy ()
-  , base_attributes_ (id)
-  , discriminant_type_ (0)
-  , default_index_ (-1)
-  , ncases_ (0)
-  , cases_ ()
-{
-}
diff --git a/TAO/tao/Union_TypeCode_Static.cpp b/TAO/tao/Union_TypeCode_Static.cpp
deleted file mode 100644
index 6bb5888f2ca..00000000000
--- a/TAO/tao/Union_TypeCode_Static.cpp
+++ /dev/null
@@ -1,399 +0,0 @@
-// $Id$
-
-#include "tao/Union_TypeCode_Static.h"
-#include "tao/TypeCode_Case.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/Union_TypeCode_Static.inl"
-#endif  /* !__ACE_INLINE__ */
-
-#include "tao/SystemException.h"
-
-#include "ace/Value_Ptr.h"
-
-
-ACE_RCSID (tao,
-           Union_TypeCode_Static,
-           "$Id$")
-
-
-bool
-TAO::TypeCode::Union<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Case<char const *,
-                                         CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::tao_marshal (
-  TAO_OutputCDR & cdr,
-  CORBA::ULong offset) const
-{
-  // A tk_union TypeCode has a "complex" parameter list type (see
-  // Table 15-2 in Section 15.3.5.1 "TypeCode" in the CDR section of
-  // the CORBA specification), meaning that it must be marshaled into
-  // a CDR encapsulation.
-
-  // Create a CDR encapsulation.
-  TAO_OutputCDR enc;
-
-  bool const success =
-    (enc << TAO_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER))
-    && (enc << TAO_OutputCDR::from_string (this->base_attributes_.id (), 0))
-    && (enc << TAO_OutputCDR::from_string (this->base_attributes_.name (), 0))
-    && marshal (enc,
-                Traits<char const *>::get_typecode (this->discriminant_type_),
-                offset + enc.total_length ())
-    && (enc << this->default_index_)
-    && (enc << this->ncases_);
-
-  if (!success)
-    return false;
-
-  // Note that we handle the default case below, too.
-
-  for (unsigned int i = 0; i < this->ncases_; ++i)
-    {
-      case_type const & c = *this->cases_[i];
-
-      if (!c.marshal (enc, offset + enc.total_length ()))
-        return false;
-    }
-
-  return
-    cdr << static_cast<CORBA::ULong> (enc.total_length ())
-    && cdr.write_octet_array_mb (enc.begin ());
-}
-
-void
-TAO::TypeCode::Union<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Case<char const *,
-                                         CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::tao_duplicate (void)
-{
-}
-
-void
-TAO::TypeCode::Union<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Case<char const *,
-                                         CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::tao_release (void)
-{
-}
-
-CORBA::Boolean
-TAO::TypeCode::Union<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Case<char const *,
-                                         CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::equal_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // These calls shouldn't throw since CORBA::TypeCode::equal()
-  // verified that the TCKind is the same as our's prior to invoking
-  // this method, meaning that the CORBA::tk_union TypeCode methods
-  // are supported.
-
-  CORBA::ULong const tc_count =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Long tc_def = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (tc_count != this->ncases_
-      || tc_def != this->default_index_)
-    return 0;
-
-  // Check the discriminator type.
-  CORBA::TypeCode_var tc_discriminator =
-    tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Boolean const equal_discriminators =
-    Traits<char const *>::get_typecode (this->discriminant_type_)->equal (
-      tc_discriminator.in ()
-      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (!equal_discriminators)
-    return 0;
-
-  for (CORBA::ULong i = 0; i < this->ncases_; ++i)
-    {
-      if (this->default_index_ > -1
-          && static_cast<CORBA::ULong> (this->default_index_) == i)
-        {
-          // Don't bother checking equality of default case label.  It
-          // will always be the zero octet (the CDR encoded value is
-          // ignored).
-          continue;
-        }
-
-      case_type const & lhs_case = *this->cases_[i];
-
-      bool const equal_case =
-        lhs_case.equal (i,
-                        tc
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (!equal_case)
-        return 0;
-    }
-
-  return 1;
-}
-
-CORBA::Boolean
-TAO::TypeCode::Union<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Case<char const *,
-                                         CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::equivalent_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // Perform a structural comparison, excluding the name() and
-  // member_name() operations.
-
-  CORBA::ULong const tc_count =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Long tc_def = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (tc_count != this->ncases_
-      || tc_def != this->default_index_)
-    return 0;
-
-  CORBA::TypeCode_var tc_discriminator =
-    tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Boolean const equiv_discriminators =
-    Traits<char const *>::get_typecode (this->discriminant_type_)->equivalent (
-      tc_discriminator.in ()
-      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (!equiv_discriminators)
-    return 0;
-
-  for (CORBA::ULong i = 0; i < this->ncases_; ++i)
-    {
-      if (this->default_index_ > -1
-          && static_cast<CORBA::ULong> (this->default_index_) == i)
-        {
-          // Don't bother checking equality/equivalence of default
-          // case label.  It will always be the zero octet (the CDR
-          // encoded value is ignored).
-          continue;
-        }
-
-      case_type const & lhs_case = *this->cases_[i];
-
-      bool const equivalent_case =
-        lhs_case.equivalent (i,
-                             tc
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (!equivalent_case)
-        return 0;
-    }
-
-  return 1;
-}
-
-CORBA::TypeCode_ptr
-TAO::TypeCode::Union<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Case<char const *,
-                                         CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
-{
-//   typedef ACE::Value_Ptr<TAO::TypeCode::Case<CORBA::String_var,
-//                                              CORBA::TypeCode_var> > elem_type;
-
-//   ACE_Array_Base<elem_type> tc_cases (this->ncases_);
-
-//   if (this->ncases_ > 0)
-//     {
-//       // Dynamically construct a new array of cases stripped of
-//       // member names.
-
-//       static char const empty_name[] = "";
-
-//       for (CORBA::ULong i = 0; i < this->ncases_; ++i)
-//         {
-//           // Member names will be stripped, i.e. not embedded within
-//           // the compact TypeCode.
-//           tc_cases[i].name = empty_name;
-//           tc_cases[i].type =
-//             this->cases_[i]->type ()->get_compact_typecode (
-//               ACE_ENV_ARG_PARAMETER);
-//           ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-//         }
-//     }
-
-//   // Create the compact union TypeCode.
-//   TAO_TypeCodeFactory_Adapter * adapter =
-//     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-//       TAO_ORB_Core::typecodefactory_adapter_name ());
-
-//   if (adapter == 0)
-//     {
-//       ACE_THROW_RETURN (CORBA::INTERNAL (),
-//                         CORBA::TypeCode::_nil ());
-//     }
-
-//   return
-//     adapter->create_union_tc (
-//       this->base_attributes_.id (),
-//       "",  /* empty name */
-//       Traits<char const *>::get_typecode (this->discriminant_type_),
-//       tc_cases,
-//       this->ncases_,
-//       this->default_index_,
-//       "",
-//       Traits<char const *>::get_typecode (this->default_case_.type)
-//       ACE_ENV_ARG_PARAMETER);
-//   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::TypeCode::_nil ());
-}
-
-char const *
-TAO::TypeCode::Union<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Case<char const *,
-                                         CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::id_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->base_attributes_.id ();
-}
-
-char const *
-TAO::TypeCode::Union<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Case<char const *,
-                                         CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::name_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->base_attributes_.name ();
-}
-
-CORBA::ULong
-TAO::TypeCode::Union<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Case<char const *,
-                                         CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::member_count_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->ncases_;
-}
-
-char const *
-TAO::TypeCode::Union<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Case<char const *,
-                                         CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::member_name_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  if (index >= this->ncases_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
-
-  return this->cases_[index]->name ();
-}
-
-CORBA::TypeCode_ptr
-TAO::TypeCode::Union<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Case<char const *,
-                                         CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::member_type_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
-{
-  if (index >= this->ncases_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
-                      CORBA::TypeCode::_nil ());
-
-  return CORBA::TypeCode::_duplicate (this->cases_[index]->type ());
-}
-
-CORBA::Any *
-TAO::TypeCode::Union<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Case<char const *,
-                                         CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::member_label_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
-{
-  if (index >= this->ncases_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
-                      0);
-
-  // Default case.
-  if (this->default_index_ > -1
-      && static_cast<CORBA::ULong> (this->default_index_) == index)
-    {
-      CORBA::Any * any;
-      ACE_NEW_THROW_EX (any,
-                        CORBA::Any,
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (0);
-
-      CORBA::Any_var safe_any (any);
-
-      // Default case's label is a zero octet.
-      CORBA::Any::from_octet const zero_octet (0);
-
-      // Default case/member has a zero octet label value.
-      (*any) <<= zero_octet;
-
-      return safe_any._retn ();
-    }
-
-  // Non-default cases.
-  return this->cases_[index]->label (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-TAO::TypeCode::Union<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Case<char const *,
-                                         CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::discriminator_type_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return
-    CORBA::TypeCode::_duplicate (
-      Traits<char const *>::get_typecode (this->discriminant_type_));
-}
-
-CORBA::Long
-TAO::TypeCode::Union<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Case<char const *,
-                                         CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::default_index_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->default_index_;
-}
diff --git a/TAO/tao/Union_TypeCode_Static.h b/TAO/tao/Union_TypeCode_Static.h
deleted file mode 100644
index 60bc6a77364..00000000000
--- a/TAO/tao/Union_TypeCode_Static.h
+++ /dev/null
@@ -1,169 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Union_TypeCode_Static.h
- *
- *  $Id$
- *
- *  Header file for a static @c tk_union CORBA::TypeCode.
- *
- *  @author Ossama Othman
- */
-//=============================================================================
-
-#ifndef TAO_UNION_TYPECODE_STATIC_H
-#define TAO_UNION_TYPECODE_STATIC_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TypeCode.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TypeCode_Base_Attributes.h"
-#include "tao/Null_RefCount_Policy.h"
-
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    template <typename StringType,
-              typename TypeCodeType,
-              class CaseArrayType,
-              class RefCountPolicy> class Union;
-    template <typename StringType, typename TypeCodeType> class Case;
-    /**
-     * @class Union
-     *
-     * @brief @c CORBA::TypeCode implementation for an OMG IDL
-     *        @c union.
-     *
-     * This class implements a @c CORBA::TypeCode for an OMG IDL
-     * @c union.
-     */
-    template<>
-    class TAO_Export Union<char const *,
-                           CORBA::TypeCode_ptr const *,
-                           Case<char const *,
-                                CORBA::TypeCode_ptr const *> const * const *,
-                           TAO::Null_RefCount_Policy>
-      : public CORBA::TypeCode,
-        private TAO::Null_RefCount_Policy
-    {
-    public:
-
-      /// @typedef Type of individual case array element, not the
-      ///          array itself.
-      typedef TAO::TypeCode::Case<char const *,
-                                  CORBA::TypeCode_ptr const *> case_type;
-
-      /// Constructor.
-      Union (char const * id,
-             char const * name,
-             CORBA::TypeCode_ptr const * discriminant_type,
-             Case<char const *,
-                  CORBA::TypeCode_ptr const *> const * const * cases,
-             CORBA::ULong ncases,
-             CORBA::Long default_index);
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
-      //@}
-
-    protected:
-
-      /**
-       * @name @c TAO CORBA::TypeCode Template Methods
-       *
-       * @c tk_union @c CORBA::TypeCode -specific template methods.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * member_name_i (CORBA::ULong index
-                                          ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index
-                                                 ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Any * member_label_i (CORBA::ULong index
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr discriminator_type_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::Long default_index_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      //@}
-
-    private:
-
-      /**
-       * @c Union Attributes
-       *
-       * Attributes representing the structure of an OMG IDL
-       * @c union.
-       *
-       * @note These attributes are declared in the order in which
-       *       they are marshaled into a CDR stream in order to
-       *       increase cache hits by improving spatial locality.
-       */
-      //@{
-
-      /// Base attributes containing repository ID and name of
-      /// union type.
-      Base_Attributes<char const *> const base_attributes_;
-
-      /// Type of IDL @c union discriminant.
-      CORBA::TypeCode_ptr const * const discriminant_type_;
-
-      /// Index of the default union case.
-      /**
-       * This value will be -1 if no default case is found in the
-       * union.
-       */
-      CORBA::Long const default_index_;
-
-      /// The number of cases in the OMG IDL union, excluding the
-      /// @c default case.
-      CORBA::ULong const ncases_;
-
-      /// Array of @c TAO::TypeCode::Case representing structure of
-      /// the OMG IDL defined @c union.
-      Case<char const *,
-           CORBA::TypeCode_ptr const *> const * const * const cases_;
-
-      //@}
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/Union_TypeCode_Static.inl"
-#endif  /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_UNION_TYPECODE_STATIC_H */
diff --git a/TAO/tao/Union_TypeCode_Static.inl b/TAO/tao/Union_TypeCode_Static.inl
deleted file mode 100644
index 019a8ba2a2f..00000000000
--- a/TAO/tao/Union_TypeCode_Static.inl
+++ /dev/null
@@ -1,25 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-ACE_INLINE
-TAO::TypeCode::Union<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Case<char const *,
-                                         CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::Union (
-  char const * id,
-  char const * name,
-  CORBA::TypeCode_ptr const * discriminant_type,
-  Case<char const *, CORBA::TypeCode_ptr const *> const * const * cases,
-  CORBA::ULong ncases,
-  CORBA::Long default_index)
-  : CORBA::TypeCode (CORBA::tk_union)
-  , ACE_NESTED_CLASS (TAO, Null_RefCount_Policy) ()
-  , base_attributes_ (id, name)
-  , discriminant_type_ (discriminant_type)
-  , default_index_ (default_index)
-  , ncases_ (ncases)
-  , cases_ (cases)
-{
-}
diff --git a/TAO/tao/UserException.cpp b/TAO/tao/UserException.cpp
index 73bc0efb5b8..241852cddae 100644
--- a/TAO/tao/UserException.cpp
+++ b/TAO/tao/UserException.cpp
@@ -36,14 +36,6 @@ CORBA::UserException::operator= (CORBA::UserException const & rhs)
   return *this;
 }
 
-int
-CORBA::UserException::_is_a (char const * interface_id) const
-{
-  return ACE_OS::strcmp (interface_id,
-                         "IDL:omg.org/CORBA/UserException:1.0") == 0
-    || this->Exception::_is_a (interface_id);
-}
-
 ACE_CString
 CORBA::UserException::_info (void) const
 {
diff --git a/TAO/tao/UserException.h b/TAO/tao/UserException.h
index 80b1c85ee1a..79aa80e8766 100644
--- a/TAO/tao/UserException.h
+++ b/TAO/tao/UserException.h
@@ -18,12 +18,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/Exception.h"
+#include "tao/TAO_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Exception.h"
 
 namespace CORBA
 {
@@ -43,7 +44,7 @@ namespace CORBA
     UserException (UserException const & rhs);
 
     /// Destructor.
-    ~UserException (void);
+    virtual ~UserException (void);
 
     /// Assignment operator.
     UserException & operator= (UserException const & rhs);
@@ -57,21 +58,19 @@ namespace CORBA
 
     virtual void _raise (void) const = 0;
 
+    virtual CORBA::TypeCode_ptr _tao_type (void) const;
+
     // = TAO specific extension.
 
     /// Constructor from a repository id.
     UserException (char const * repository_id,
                    char const * local_name);
 
-    virtual int _is_a (char const * interface_id) const;
-
-    // Used for narrowing
-
     /// Returns a string containing information about the exception. This
     /// function is not CORBA compliant.
     virtual ACE_CString _info (void) const;
 
-    //protected:
+    //protected: // when msvc6 is dropped we can make this protected
     /// Default constructor.
     UserException (void);
 
diff --git a/TAO/tao/UserException.inl b/TAO/tao/UserException.inl
index 4b3730615c8..a8ca0e78f23 100644
--- a/TAO/tao/UserException.inl
+++ b/TAO/tao/UserException.inl
@@ -19,3 +19,9 @@ CORBA::UserException::_downcast (CORBA::Exception const * exception)
 {
   return dynamic_cast<const CORBA::UserException *> (exception);
 }
+
+ACE_INLINE CORBA::TypeCode_ptr
+CORBA::UserException::_tao_type (void) const
+{
+  return 0;
+}
diff --git a/TAO/tao/Utils.mpc b/TAO/tao/Utils.mpc
index 1e7a57b467c..d5f8308c9a6 100644
--- a/TAO/tao/Utils.mpc
+++ b/TAO/tao/Utils.mpc
@@ -26,6 +26,9 @@ project : taolib, core, portableserver, pi {
   PIDL_Files {
   }
 
+  IDL_Files {
+  }
+
   Pkgconfig_Files {
     TAO_Utils.pc.in
   }
diff --git a/TAO/tao/ValueModifier.pidl b/TAO/tao/ValueModifier.pidl
deleted file mode 100644
index 4cd346c5049..00000000000
--- a/TAO/tao/ValueModifier.pidl
+++ /dev/null
@@ -1,36 +0,0 @@
-// -*- IDL -*-
-
-// ================================================================
-/**
- *  @file   ValueModifier.pidl
- *
- * $Id$
- *
- *   This file was used to generate the code in ValueModifierC.* The command
- *   used to generate code is:
- *
- *     tao_idl
- *        -o orig -Ge 1 -Sc -SS -Sci -St
- *          -Wb,export_macro=TAO_Export
- *          -Wb,export_include="tao/TAO_Export.h"
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          ValueModifier.pidl
- */
-// ================================================================
-
-#ifndef TAO_VALUEMODIFIER_PIDL
-#define TAO_VALUEMODIFIER_PIDL
-
-#pragma prefix "omg.org"
-
-module CORBA
-{
-  typedef short ValueModifier;
-  const ValueModifier VM_NONE = 0;
-  const ValueModifier VM_CUSTOM = 1;
-  const ValueModifier VM_ABSTRACT = 2;
-  const ValueModifier VM_TRUNCATABLE = 3;
-};
-
-#endif /* TAO_VALUEMODIFIER_PIDL */
diff --git a/TAO/tao/ValueModifierS.h b/TAO/tao/ValueModifierS.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/ValueModifierS.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- 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/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/Value_TypeCode.cpp b/TAO/tao/Value_TypeCode.cpp
deleted file mode 100644
index 310cec78183..00000000000
--- a/TAO/tao/Value_TypeCode.cpp
+++ /dev/null
@@ -1,463 +0,0 @@
-// $Id$
-
-#ifndef TAO_VALUE_TYPECODE_CPP
-#define TAO_VALUE_TYPECODE_CPP
-
-#include "tao/Value_TypeCode.h"
-#include "tao/TypeCode_Value_Field.h"
-#include "tao/CDR.h"
-
-#include "tao/ORB_Core.h"
-#include "tao/TypeCodeFactory_Adapter.h"
-
-#include "ace/Dynamic_Service.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/Value_TypeCode.inl"
-#endif  /* !__ACE_INLINE__ */
-
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-bool
-TAO::TypeCode::Value<StringType,
-                     TypeCodeType,
-                     FieldArrayType,
-                     RefCountPolicy>::tao_marshal (
-  TAO_OutputCDR & cdr,
-  CORBA::ULong offset) const
-{
-  // A tk_value TypeCode has a "complex" parameter list type (see
-  // Table 15-2 in Section 15.3.5.1 "TypeCode" in the CDR section of
-  // the CORBA specification), meaning that it must be marshaled into
-  // a CDR encapsulation.
-
-  // Create a CDR encapsulation.
-  TAO_OutputCDR enc;
-
-  // Account for the encoded CDR encapsulation length and byte order.
-  //
-  // Aligning on an octet since the next value after the CDR
-  // encapsulation length will always be the byte order octet/boolean
-  // in this case.
-  offset = ACE_align_binary (offset + 4,
-                             ACE_CDR::OCTET_ALIGN);
-
-  bool const success =
-    (enc << TAO_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER))
-    && (enc << TAO_OutputCDR::from_string (this->base_attributes_.id (), 0))
-    && (enc << TAO_OutputCDR::from_string (this->base_attributes_.name (), 0))
-    && (enc << this->type_modifier_)
-    && marshal (enc,
-                Traits<StringType>::get_typecode (this->concrete_base_),
-                offset + enc.total_length ())
-    && (enc << this->nfields_);
-
-  if (!success)
-    return false;
-
-  Value_Field<StringType, TypeCodeType> const * const begin =
-    &this->fields_[0];
-  Value_Field<StringType, TypeCodeType> const * const end =
-    begin + this->nfields_;
-
-  for (Value_Field<StringType, TypeCodeType> const * i = begin; i != end; ++i)
-    {
-      Value_Field<StringType, TypeCodeType> const & field = *i;
-
-      if (!(enc << Traits<StringType>::get_string (field.name))
-          || !marshal (enc,
-                       Traits<StringType>::get_typecode (field.type),
-                       offset + enc.total_length ())
-          || !(enc << field.visibility))
-        return false;
-    }
-
-  return
-    cdr << static_cast<CORBA::ULong> (enc.total_length ())
-    && cdr.write_octet_array_mb (enc.begin ());
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-void
-TAO::TypeCode::Value<StringType,
-                     TypeCodeType,
-                     FieldArrayType,
-                     RefCountPolicy>::tao_duplicate (void)
-{
-  this->RefCountPolicy::add_ref ();
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-void
-TAO::TypeCode::Value<StringType,
-                     TypeCodeType,
-                     FieldArrayType,
-                     RefCountPolicy>::tao_release (void)
-{
-  this->RefCountPolicy::remove_ref ();
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-CORBA::Boolean
-TAO::TypeCode::Value<StringType,
-                     TypeCodeType,
-                     FieldArrayType,
-                     RefCountPolicy>::equal_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // None of these calls should throw since CORBA::TypeCode::equal()
-  // verified that the TCKind is the same as our's prior to invoking
-  // this method.
-
-  CORBA::ValueModifier const tc_type_modifier =
-    tc->type_modifier (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (tc_type_modifier != this->type_modifier_)
-    return 0;
-
-  CORBA::TypeCode_var rhs_concrete_base_type =
-    tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Boolean const equal_concrete_base_types =
-    this->equal (rhs_concrete_base_type.in ()
-                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (!equal_concrete_base_types)
-    return 0;
-
-  CORBA::ULong const tc_nfields =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (tc_nfields != this->nfields_)
-    return 0;
-
-  for (CORBA::ULong i = 0; i < this->nfields_; ++i)
-    {
-      Value_Field<StringType, TypeCodeType> const & lhs_field =
-        this->fields_[i];
-
-      CORBA::Visibility const lhs_visibility = lhs_field.visibility;
-      CORBA::Visibility const rhs_visibility =
-        tc->member_visibility (i
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (lhs_visibility != rhs_visibility)
-        return 0;
-
-      char const * const lhs_name =
-        Traits<StringType>::get_string (lhs_field.name);;
-      char const * const rhs_name = tc->member_name (i
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (ACE_OS::strcmp (lhs_name, rhs_name) != 0)
-        return 0;
-
-      CORBA::TypeCode_ptr const lhs_tc =
-        Traits<StringType>::get_typecode (lhs_field.type);
-      CORBA::TypeCode_var const rhs_tc =
-        tc->member_type (i
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      CORBA::Boolean const equal_members =
-        lhs_tc->equal (rhs_tc.in ()
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (!equal_members)
-        return 0;
-    }
-
-  return 1;
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-CORBA::Boolean
-TAO::TypeCode::Value<StringType,
-                     TypeCodeType,
-                     FieldArrayType,
-                     RefCountPolicy>::equivalent_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  CORBA::ValueModifier const tc_type_modifier =
-    tc->type_modifier (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (tc_type_modifier != this->type_modifier_)
-    return 0;
-
-  CORBA::TypeCode_var rhs_concrete_base_type =
-    tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Boolean const equivalent_concrete_base_types =
-    this->equivalent (rhs_concrete_base_type.in ()
-                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (!equivalent_concrete_base_types)
-    return 0;
-
-  // Perform a structural comparison, excluding the name() and
-  // member_name() operations.
-
-  CORBA::ULong const tc_nfields =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (tc_nfields != this->nfields_)
-    return 0;
-
-  for (CORBA::ULong i = 0; i < this->nfields_; ++i)
-    {
-      Value_Field<StringType, TypeCodeType> const & lhs_field =
-        this->fields_[i];
-
-      CORBA::Visibility const lhs_visibility =
-        lhs_field.visibility;
-      CORBA::Visibility const rhs_visibility =
-        tc->member_visibility (i
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (lhs_visibility != rhs_visibility)
-        return 0;
-
-      CORBA::TypeCode_ptr const lhs_tc =
-        Traits<StringType>::get_typecode (lhs_field.type);
-      CORBA::TypeCode_var const rhs_tc =
-        tc->member_type (i
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      CORBA::Boolean const equiv_types =
-        lhs_tc->equivalent (rhs_tc.in ()
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (!equiv_types)
-        return 0;
-    }
-
-  return 1;
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-CORBA::TypeCode_ptr
-TAO::TypeCode::Value<StringType,
-                     TypeCodeType,
-                     FieldArrayType,
-                     RefCountPolicy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
-{
-  ACE_Array_Base<Value_Field<CORBA::String_var, CORBA::TypeCode_var> >
-    tc_fields (this->nfields_);
-
-  if (this->nfields_ > 0)
-    {
-      // Dynamically construct a new array of fields stripped of
-      // member names.
-
-      static char const empty_name[] = "";
-
-      for (CORBA::ULong i = 0; i < this->nfields_; ++i)
-        {
-          // Member names will be stripped, i.e. not embedded within
-          // the compact TypeCode.
-
-          tc_fields[i].name = empty_name;
-          tc_fields[i].type =
-            Traits<StringType>::get_typecode (
-              this->fields_[i].type)->get_compact_typecode (
-                ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-          tc_fields[i].visibility = this->fields_[i].visibility;
-        }
-    }
-
-  TAO_TypeCodeFactory_Adapter * const adapter =
-    ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-      TAO_ORB_Core::typecodefactory_adapter_name ());
-
-  if (adapter == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        CORBA::TypeCode::_nil ());
-    }
-
-  return
-    adapter->create_value_event_tc (
-      this->kind_,
-      this->base_attributes_.id (),
-      "", // empty name
-      this->type_modifier_,
-      Traits<StringType>::get_typecode (this->concrete_base_),
-      tc_fields,
-      this->nfields_
-      ACE_ENV_ARG_PARAMETER);
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-char const *
-TAO::TypeCode::Value<StringType,
-                     TypeCodeType,
-                     FieldArrayType,
-                     RefCountPolicy>::id_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->base_attributes_.id ();
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-char const *
-TAO::TypeCode::Value<StringType,
-                     TypeCodeType,
-                     FieldArrayType,
-                     RefCountPolicy>::name_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->base_attributes_.name ();
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-CORBA::ULong
-TAO::TypeCode::Value<StringType,
-                     TypeCodeType,
-                     FieldArrayType,
-                     RefCountPolicy>::member_count_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->nfields_;
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-char const *
-TAO::TypeCode::Value<StringType,
-                     TypeCodeType,
-                     FieldArrayType,
-                     RefCountPolicy>::member_name_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  if (index >= this->nfields_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
-
-  return Traits<StringType>::get_string (this->fields_[index].name);
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-CORBA::TypeCode_ptr
-TAO::TypeCode::Value<StringType,
-                     TypeCodeType,
-                     FieldArrayType,
-                     RefCountPolicy>::member_type_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
-{
-  if (index >= this->nfields_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
-                      CORBA::TypeCode::_nil ());
-
-  return
-    CORBA::TypeCode::_duplicate (
-      Traits<StringType>::get_typecode (this->fields_[index].type));
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-CORBA::Visibility
-TAO::TypeCode::Value<StringType,
-                     TypeCodeType,
-                     FieldArrayType,
-                     RefCountPolicy>::member_visibility_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
-{
-  if (index >= this->nfields_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
-                      CORBA::PRIVATE_MEMBER);
-
-  return this->fields_[index].visibility;
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-CORBA::ValueModifier
-TAO::TypeCode::Value<StringType,
-                     TypeCodeType,
-                     FieldArrayType,
-                     RefCountPolicy>::type_modifier_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->type_modifier_;
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-CORBA::TypeCode_ptr
-TAO::TypeCode::Value<StringType,
-                     TypeCodeType,
-                     FieldArrayType,
-                     RefCountPolicy>::concrete_base_type_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return
-    CORBA::TypeCode::_duplicate (
-      Traits<StringType>::get_typecode (this->concrete_base_));
-}
-
-
-#endif  /* TAO_VALUE_TYPECODE_CPP */
diff --git a/TAO/tao/Value_TypeCode.h b/TAO/tao/Value_TypeCode.h
deleted file mode 100644
index 7bb386579fc..00000000000
--- a/TAO/tao/Value_TypeCode.h
+++ /dev/null
@@ -1,179 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Value_TypeCode.h
- *
- *  $Id$
- *
- *  Header file for a @c tk_value and @c tk_event
- *  @c CORBA::TypeCodes.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_VALUE_TYPECODE_H
-#define TAO_VALUE_TYPECODE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TypeCode.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TypeCode_Base_Attributes.h"
-#include "tao/ValueModifierC.h"
-#include "tao/VisibilityC.h"
-
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    template<typename StringType, typename TypeCodeType> struct Value_Field;
-
-    /**
-     * @class Value
-     *
-     * @brief @c CORBA::TypeCode implementation for an OMG IDL
-     *        @c valuetype or @c event.
-     *
-     * This class implements a @c CORBA::TypeCode for an OMG IDL
-     * @c valuetype or @c event.
-     */
-    template <typename StringType,
-              typename TypeCodeType,
-              class FieldArrayType,
-              class RefCountPolicy>
-    class Value
-      : public CORBA::TypeCode,
-        private RefCountPolicy
-    {
-    public:
-
-      /// Constructor.
-      Value (CORBA::TCKind kind,
-             char const * id,
-             char const * name,
-             CORBA::ValueModifier modifier,
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x572)
-             // Borland C++ currently can't handle a reference to
-             // const pointer to const CORBA::TypeCode_ptr
-             TypeCodeType concrete_base,
-#else
-             TypeCodeType const & concrete_base,
-#endif
-             FieldArrayType const & fields,
-             CORBA::ULong nfields);
-
-      /// Constructor used for recursive TypeCodes.
-      Value (CORBA::TCKind kind,
-              char const * id);
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
-      //@}
-
-    protected:
-
-      /**
-       * @name @c TAO CORBA::TypeCode Template Methods
-       *
-       * @c tk_value or @c tk_event @c CORBA::TypeCode -specific
-       * template methods.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * member_name_i (CORBA::ULong index
-                                          ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index
-                                                 ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Visibility member_visibility_i (CORBA::ULong index
-                                                     ACE_ENV_ARG_DECL) const;
-      virtual CORBA::ValueModifier type_modifier_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr concrete_base_type_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      //@}
-
-    protected:
-
-      /**
-       * @c Valuetype Attributes
-       *
-       * Attributes representing the structure of an OMG IDL
-       * @c valuetype or @c event.
-       *
-       * @note These attributes are declared in the order in which
-       *       they are marshaled into a CDR stream in order to
-       *       increase cache hits by improving spatial locality.
-       */
-      //@{
-
-      /// Base attributes containing repository ID and name of
-      /// @c valuetype.
-      Base_Attributes<StringType> base_attributes_;
-
-      /// The @c ValueModifier of the @c valuetype of @c eventtype
-      /// represented by this @c TypeCode.
-      CORBA::ValueModifier type_modifier_;
-
-      /// The @c TypeCode corresponding to the concrete base
-      /// @c valuetype or @c eventtype.
-      TypeCodeType concrete_base_;
-
-      /// The number of fields in the OMG IDL value.
-      CORBA::ULong nfields_;
-
-      /// Array of @c TAO::TypeCode fields representing structure of the
-      /// OMG IDL defined @c value.
-      FieldArrayType fields_;
-
-      //@}
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/Value_TypeCode.inl"
-#endif  /* __ACE_INLINE__ */
-
-#ifdef ACE_TEMPLATES_REQUIRE_SOURCE
-# include "tao/Value_TypeCode.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
-# pragma implementation ("Value_TypeCode.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_VALUE_TYPECODE_H */
diff --git a/TAO/tao/Value_TypeCode.inl b/TAO/tao/Value_TypeCode.inl
deleted file mode 100644
index 9a8b31f0ddb..00000000000
--- a/TAO/tao/Value_TypeCode.inl
+++ /dev/null
@@ -1,57 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-ACE_INLINE
-TAO::TypeCode::Value<StringType,
-                     TypeCodeType,
-                     FieldArrayType,
-                     RefCountPolicy>::Value (
-  CORBA::TCKind kind,
-  char const * id,
-  char const * name,
-  CORBA::ValueModifier modifier,
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x572)
-  // Borland C++ currently can't handle a reference to
-  // const pointer to const CORBA::TypeCode_ptr
-  TypeCodeType concrete_base,
-#else
-  TypeCodeType const & concrete_base,
-#endif
-  FieldArrayType const & fields,
-  CORBA::ULong nfields)
-  : CORBA::TypeCode (kind)
-  , RefCountPolicy ()
-  , base_attributes_ (id, name)
-  , type_modifier_ (modifier)
-  , concrete_base_ (concrete_base)
-  , nfields_ (nfields)
-  , fields_ (fields)
-{
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-ACE_INLINE
-TAO::TypeCode::Value<StringType,
-                     TypeCodeType,
-                     FieldArrayType,
-                     RefCountPolicy>::Value (
-  CORBA::TCKind kind,
-  char const * id)
-  : CORBA::TypeCode (kind)
-  , RefCountPolicy ()
-  , base_attributes_ (id)
-  , type_modifier_ (CORBA::VM_NONE)
-  , concrete_base_ ()
-  , nfields_ (0)
-  , fields_ ()
-{
-}
diff --git a/TAO/tao/Value_TypeCode_Static.cpp b/TAO/tao/Value_TypeCode_Static.cpp
deleted file mode 100644
index 4820610d9ad..00000000000
--- a/TAO/tao/Value_TypeCode_Static.cpp
+++ /dev/null
@@ -1,422 +0,0 @@
-// $Id$
-
-#include "tao/Value_TypeCode_Static.h"
-#include "tao/TypeCode_Value_Field.h"
-#include "tao/CDR.h"
-
-#include "tao/ORB_Core.h"
-#include "tao/TypeCodeFactory_Adapter.h"
-
-#include "ace/Dynamic_Service.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/Value_TypeCode_Static.inl"
-#endif  /* !__ACE_INLINE__ */
-
-
-ACE_RCSID (tao,
-           Value_TypeCode_Static,
-           "$Id$")
-
-
-bool
-TAO::TypeCode::Value<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Value_Field<char const *,
-                                                CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::tao_marshal (
-  TAO_OutputCDR & cdr,
-  CORBA::ULong offset) const
-{
-  // A tk_value TypeCode has a "complex" parameter list type (see
-  // Table 15-2 in Section 15.3.5.1 "TypeCode" in the CDR section of
-  // the CORBA specification), meaning that it must be marshaled into
-  // a CDR encapsulation.
-
-  // Create a CDR encapsulation.
-  TAO_OutputCDR enc;
-
-  // Account for the encoded CDR encapsulation length and byte order.
-  //
-  // Aligning on an octet since the next value after the CDR
-  // encapsulation length will always be the byte order octet/boolean
-  // in this case.
-  offset = ACE_align_binary (offset + 4,
-                             ACE_CDR::OCTET_ALIGN);
-
-  bool const success =
-    (enc << TAO_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER))
-    && (enc << TAO_OutputCDR::from_string (this->base_attributes_.id (), 0))
-    && (enc << TAO_OutputCDR::from_string (this->base_attributes_.name (), 0))
-    && (enc << this->type_modifier_)
-    && marshal (enc,
-                Traits<char const *>::get_typecode (this->concrete_base_),
-                offset + enc.total_length ())
-    && (enc << this->nfields_);
-
-  if (!success)
-    return false;
-
-  Value_Field<char const *, CORBA::TypeCode_ptr const *> const * const begin =
-    &this->fields_[0];
-  Value_Field<char const *, CORBA::TypeCode_ptr const *> const * const end =
-    begin + this->nfields_;
-
-  for (Value_Field<char const *, CORBA::TypeCode_ptr const *> const * i =
-         begin;
-       i != end;
-       ++i)
-    {
-      Value_Field<char const *, CORBA::TypeCode_ptr const *> const & field = *i;
-
-      if (!(enc << Traits<char const *>::get_string (field.name))
-          || !marshal (enc,
-                       Traits<char const *>::get_typecode (field.type),
-                       offset + enc.total_length ())
-          || !(enc << field.visibility))
-        return false;
-    }
-
-  return
-    cdr << static_cast<CORBA::ULong> (enc.total_length ())
-    && cdr.write_octet_array_mb (enc.begin ());
-}
-
-void
-TAO::TypeCode::Value<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Value_Field<char const *,
-                                                CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::tao_duplicate (void)
-{
-}
-
-void
-TAO::TypeCode::Value<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Value_Field<char const *,
-                                                CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::tao_release (void)
-{
-}
-
-CORBA::Boolean
-TAO::TypeCode::Value<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Value_Field<char const *,
-                                                CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::equal_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // None of these calls should throw since CORBA::TypeCode::equal()
-  // verified that the TCKind is the same as our's prior to invoking
-  // this method.
-
-  CORBA::ValueModifier const tc_type_modifier =
-    tc->type_modifier (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (tc_type_modifier != this->type_modifier_)
-    return 0;
-
-  CORBA::TypeCode_var rhs_concrete_base_type =
-    tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Boolean const equal_concrete_base_types =
-    this->equal (rhs_concrete_base_type.in ()
-                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (!equal_concrete_base_types)
-    return 0;
-
-  CORBA::ULong const tc_nfields =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (tc_nfields != this->nfields_)
-    return 0;
-
-  for (CORBA::ULong i = 0; i < this->nfields_; ++i)
-    {
-      Value_Field<char const *, CORBA::TypeCode_ptr const *> const & lhs_field =
-        this->fields_[i];
-
-      CORBA::Visibility const lhs_visibility = lhs_field.visibility;
-      CORBA::Visibility const rhs_visibility =
-        tc->member_visibility (i
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (lhs_visibility != rhs_visibility)
-        return 0;
-
-      char const * const lhs_name =
-        Traits<char const *>::get_string (lhs_field.name);;
-      char const * const rhs_name = tc->member_name (i
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (ACE_OS::strcmp (lhs_name, rhs_name) != 0)
-        return 0;
-
-      CORBA::TypeCode_ptr const lhs_tc =
-        Traits<char const *>::get_typecode (lhs_field.type);
-      CORBA::TypeCode_var const rhs_tc =
-        tc->member_type (i
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      CORBA::Boolean const equal_members =
-        lhs_tc->equal (rhs_tc.in ()
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (!equal_members)
-        return 0;
-    }
-
-  return 1;
-}
-
-CORBA::Boolean
-TAO::TypeCode::Value<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Value_Field<char const *,
-                                                CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::equivalent_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  CORBA::ValueModifier const tc_type_modifier =
-    tc->type_modifier (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (tc_type_modifier != this->type_modifier_)
-    return 0;
-
-  CORBA::TypeCode_var rhs_concrete_base_type =
-    tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Boolean const equivalent_concrete_base_types =
-    this->equivalent (rhs_concrete_base_type.in ()
-                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (!equivalent_concrete_base_types)
-    return 0;
-
-  // Perform a structural comparison, excluding the name() and
-  // member_name() operations.
-
-  CORBA::ULong const tc_nfields =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (tc_nfields != this->nfields_)
-    return 0;
-
-  for (CORBA::ULong i = 0; i < this->nfields_; ++i)
-    {
-      Value_Field<char const *,
-                  CORBA::TypeCode_ptr const *> const & lhs_field =
-        this->fields_[i];
-
-      CORBA::Visibility const lhs_visibility =
-        lhs_field.visibility;
-      CORBA::Visibility const rhs_visibility =
-        tc->member_visibility (i
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (lhs_visibility != rhs_visibility)
-        return 0;
-
-      CORBA::TypeCode_ptr const lhs_tc =
-        Traits<char const *>::get_typecode (lhs_field.type);
-      CORBA::TypeCode_var const rhs_tc =
-        tc->member_type (i
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      CORBA::Boolean const equiv_types =
-        lhs_tc->equivalent (rhs_tc.in ()
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (!equiv_types)
-        return 0;
-    }
-
-  return 1;
-}
-
-CORBA::TypeCode_ptr
-TAO::TypeCode::Value<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Value_Field<char const *,
-                                                CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
-{
-  ACE_Array_Base<Value_Field<CORBA::String_var, CORBA::TypeCode_var> >
-    tc_fields (this->nfields_);
-
-  if (this->nfields_ > 0)
-    {
-      // Dynamically construct a new array of fields stripped of
-      // member names.
-
-      static char const empty_name[] = "";
-
-      for (CORBA::ULong i = 0; i < this->nfields_; ++i)
-        {
-          // Member names will be stripped, i.e. not embedded within
-          // the compact TypeCode.
-
-          tc_fields[i].name = empty_name;
-          tc_fields[i].type =
-            Traits<char const *>::get_typecode (
-              this->fields_[i].type)->get_compact_typecode (
-                ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-          tc_fields[i].visibility = this->fields_[i].visibility;
-        }
-    }
-
-  TAO_TypeCodeFactory_Adapter * const adapter =
-    ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-      TAO_ORB_Core::typecodefactory_adapter_name ());
-
-  if (adapter == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        CORBA::TypeCode::_nil ());
-    }
-
-  return
-    adapter->create_value_event_tc (
-      this->kind_,
-      this->base_attributes_.id (),
-      "", // empty name
-      this->type_modifier_,
-      Traits<char const *>::get_typecode (this->concrete_base_),
-      tc_fields,
-      this->nfields_
-      ACE_ENV_ARG_PARAMETER);
-}
-
-char const *
-TAO::TypeCode::Value<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Value_Field<char const *,
-                                                CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::id_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->base_attributes_.id ();
-}
-
-char const *
-TAO::TypeCode::Value<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Value_Field<char const *,
-                                                CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::name_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->base_attributes_.name ();
-}
-
-CORBA::ULong
-TAO::TypeCode::Value<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Value_Field<char const *,
-                                                CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::member_count_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->nfields_;
-}
-
-char const *
-TAO::TypeCode::Value<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Value_Field<char const *,
-                                                CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::member_name_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  if (index >= this->nfields_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
-
-  return Traits<char const *>::get_string (this->fields_[index].name);
-}
-
-CORBA::TypeCode_ptr
-TAO::TypeCode::Value<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Value_Field<char const *,
-                                                CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::member_type_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
-{
-  if (index >= this->nfields_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
-                      CORBA::TypeCode::_nil ());
-
-  return
-    CORBA::TypeCode::_duplicate (
-      Traits<char const *>::get_typecode (this->fields_[index].type));
-}
-
-CORBA::Visibility
-TAO::TypeCode::Value<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Value_Field<char const *,
-                                                CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::member_visibility_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
-{
-  if (index >= this->nfields_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
-                      CORBA::PRIVATE_MEMBER);
-
-  return this->fields_[index].visibility;
-}
-
-CORBA::ValueModifier
-TAO::TypeCode::Value<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Value_Field<char const *,
-                                                CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::type_modifier_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->type_modifier_;
-}
-
-CORBA::TypeCode_ptr
-TAO::TypeCode::Value<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Value_Field<char const *,
-                                                CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::concrete_base_type_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return
-    CORBA::TypeCode::_duplicate (
-      Traits<char const *>::get_typecode (this->concrete_base_));
-}
diff --git a/TAO/tao/Value_TypeCode_Static.h b/TAO/tao/Value_TypeCode_Static.h
deleted file mode 100644
index 4c44af4d5d0..00000000000
--- a/TAO/tao/Value_TypeCode_Static.h
+++ /dev/null
@@ -1,168 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Value_TypeCode_Static.h
- *
- *  $Id$
- *
- *  Header file for static @c tk_value and @c tk_event
- *  @c CORBA::TypeCodes.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_VALUE_TYPECODE_STATIC_H
-#define TAO_VALUE_TYPECODE_STATIC_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TypeCode.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TypeCode_Base_Attributes.h"
-#include "tao/ValueModifierC.h"
-#include "tao/VisibilityC.h"
-#include "tao/Null_RefCount_Policy.h"
-
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    template<typename StringType, typename TypeCodeType> struct Value_Field;
-    template <typename StringType,
-              typename TypeCodeType,
-              class FieldArrayType,
-              class RefCountPolicy> class Value;
-
-    /**
-     * @class Value
-     *
-     * @brief @c CORBA::TypeCode implementation for an OMG IDL
-     *        @c valuetype or @c event.
-     *
-     * This class implements a @c CORBA::TypeCode for an OMG IDL
-     * @c valuetype or @c event.
-     */
-    template<>
-    class TAO_Export Value<char const *,
-                           CORBA::TypeCode_ptr const *,
-                           Value_Field<char const *,
-                                       CORBA::TypeCode_ptr const *> const *,
-                           TAO::Null_RefCount_Policy>
-      : public CORBA::TypeCode,
-        private TAO::Null_RefCount_Policy
-    {
-    public:
-
-      /// Constructor.
-      Value (CORBA::TCKind kind,
-             char const * id,
-             char const * name,
-             CORBA::ValueModifier modifier,
-             CORBA::TypeCode_ptr const * concrete_base,
-             Value_Field<char const *,
-                         CORBA::TypeCode_ptr const *> const * fields,
-             CORBA::ULong nfields);
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
-      //@}
-
-    protected:
-
-      /**
-       * @name @c TAO CORBA::TypeCode Template Methods
-       *
-       * @c tk_value or @c tk_event @c CORBA::TypeCode -specific
-       * template methods.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * member_name_i (CORBA::ULong index
-                                          ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index
-                                                 ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Visibility member_visibility_i (CORBA::ULong index
-                                                     ACE_ENV_ARG_DECL) const;
-      virtual CORBA::ValueModifier type_modifier_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr concrete_base_type_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      //@}
-
-    private:
-
-      /**
-       * @c Valuetype Attributes
-       *
-       * Attributes representing the structure of an OMG IDL
-       * @c valuetype or @c event.
-       *
-       * @note These attributes are declared in the order in which
-       *       they are marshaled into a CDR stream in order to
-       *       increase cache hits by improving spatial locality.
-       */
-      //@{
-
-      /// Base attributes containing repository ID and name of
-      /// @c valuetype.
-      Base_Attributes<char const *> const base_attributes_;
-
-      /// The @c ValueModifier of the @c valuetype of @c eventtype
-      /// represented by this @c TypeCode.
-      CORBA::ValueModifier const type_modifier_;
-
-      /// The @c TypeCode corresponding to the concrete base
-      /// @c valuetype or @c eventtype.
-      CORBA::TypeCode_ptr const * const concrete_base_;
-
-      /// The number of fields in the OMG IDL value.
-      CORBA::ULong const nfields_;
-
-      /// Array of @c TAO::TypeCode fields representing structure of the
-      /// OMG IDL defined @c value.
-      Value_Field<char const *,
-                  CORBA::TypeCode_ptr const *> const * const fields_;
-
-      //@}
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/Value_TypeCode_Static.inl"
-#endif  /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_VALUE_TYPECODE_STATIC_H */
diff --git a/TAO/tao/Value_TypeCode_Static.inl b/TAO/tao/Value_TypeCode_Static.inl
deleted file mode 100644
index 70c7d6cf1b1..00000000000
--- a/TAO/tao/Value_TypeCode_Static.inl
+++ /dev/null
@@ -1,26 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-ACE_INLINE
-TAO::TypeCode::Value<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Value_Field<char const *,
-                                                CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::Value (
-  CORBA::TCKind kind,
-  char const * id,
-  char const * name,
-  CORBA::ValueModifier modifier,
-  CORBA::TypeCode_ptr const * concrete_base,
-  Value_Field<char const *, CORBA::TypeCode_ptr const *> const * fields,
-  CORBA::ULong nfields)
-  : CORBA::TypeCode (kind)
-  , ACE_NESTED_CLASS (TAO, Null_RefCount_Policy) ()
-  , base_attributes_ (id, name)
-  , type_modifier_ (modifier)
-  , concrete_base_ (concrete_base)
-  , nfields_ (nfields)
-  , fields_ (fields)
-{
-}
diff --git a/TAO/tao/Valuetype.mpc b/TAO/tao/Valuetype.mpc
index 3d05f7a1d48..f7605c82852 100644
--- a/TAO/tao/Valuetype.mpc
+++ b/TAO/tao/Valuetype.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project : taolib, core {
+project : taolib, core, anytypecode {
   sharedname    = TAO_Valuetype
   dynamicflags  = TAO_VALUETYPE_BUILD_DLL
 
@@ -26,6 +26,9 @@ project : taolib, core {
   PIDL_Files {
   }
 
+  IDL_Files {
+  }
+
   Pkgconfig_Files {
     Valuetype/TAO_Valuetype.pc.in
   }
diff --git a/TAO/tao/Valuetype/AbstractBase.h b/TAO/tao/Valuetype/AbstractBase.h
index 4ca2a514c75..a57c18bf05d 100644
--- a/TAO/tao/Valuetype/AbstractBase.h
+++ b/TAO/tao/Valuetype/AbstractBase.h
@@ -158,7 +158,9 @@ namespace TAO
     : public Object_Arg_Traits_T<CORBA::AbstractBase_ptr,
                                  CORBA::AbstractBase_var,
                                  CORBA::AbstractBase_out,
-                                 TAO::Objref_Traits<CORBA::AbstractBase> >
+                                 TAO::Objref_Traits<CORBA::AbstractBase>,
+                                 TAO::Any_Insert_Policy_Stream <CORBA::AbstractBase_ptr>
+                                >
   {
   };
 }
diff --git a/TAO/tao/Valuetype/Seq_Tmplinst.cpp b/TAO/tao/Valuetype/Seq_Tmplinst.cpp
deleted file mode 100644
index bd13c67cf9e..00000000000
--- a/TAO/tao/Valuetype/Seq_Tmplinst.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    Seq_Tmplinst.cpp
-//
-// = DESCRIPTION
-//   Explicit instantiation of the TAO sequence template classes for ValueBase
-//   and AbstractBase. These instantiations free us from having to
-//   generate them over and over with the IDL compiler.
-//
-// = AUTHOR
-//     Jeff Parsons <j.parsons@vanderbilt.edu>
-//
-// ============================================================================
-#include "ace/config-all.h"
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
-    defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#include "tao/Sequence_T.h"
-#include "tao/Any.h"
-#include "ValueBase.h"
-#include "AbstractBase.h"
-#include "Sequence_T.h"
-#include "ValueFactory.h"
-#endif /*if ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA*/
-
-ACE_RCSID (Valuetype,
-           Seq_Tmplinst,
-           "$Id$")
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class TAO_Valuetype_Manager<CORBA::ValueBase,
-                                     CORBA::ValueBase_var>;
-
-template class TAO_Unbounded_Valuetype_Sequence<CORBA::ValueBase,
-                                                CORBA::ValueBase_var>;
-
-template class TAO_Unbounded_Pseudo_Sequence<CORBA::AbstractBase>;
-
-template class TAO_Value_Var_T <CORBA::ValueFactoryBase>;
-
-
-template class TAO_Value_Var_T <CORBA::ValueBase>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate TAO_Valuetype_Manager<CORBA::ValueBase,
-                                          CORBA::ValueBase_var,
-                                          CORBA::tao_ValueBase_life>
-#pragma instantiate TAO_Unbounded_Valuetype_Sequence<CORBA::ValueBase, \
-                                                     CORBA::ValueBase_var, \
-                                                     CORBA::tao_ValueBase_life>
-#pragma instantiate TAO_Unbounded_Pseudo_Sequence<CORBA::AbstractBase, \
-                                                  CORBA::AbstractBase_var>
-
-#pragma instantiate TAO_Value_Var_T <CORBA::ValueFactoryBase,
-                                      CORBA::tao_ValueFactoryBase_life>
-
-#pragma instantiate TAO_Value_Var_T <CORBA::ValueBase,
-                                      CORBA::tao_ValueBase_life>
-
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Valuetype/StringValueC.cpp b/TAO/tao/Valuetype/StringValueC.cpp
index a8cd8a67fbd..d1000576a47 100644
--- a/TAO/tao/Valuetype/StringValueC.cpp
+++ b/TAO/tao/Valuetype/StringValueC.cpp
@@ -32,14 +32,15 @@
 #include "StringValueC.h"
 #include "tao/CDR.h"
 #include "tao/Valuetype/ValueFactory.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Value_TypeCode_Static.h"
-#include "tao/TypeCode_Value_Field.h"
-#include "tao/Recursive_Type_TypeCode.h"
-#include "tao/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Value_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Value_Field.h"
+#include "tao/AnyTypeCode/Recursive_Type_TypeCode.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -69,7 +70,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/CORBA/StringValue:1.0",
     "StringValue",
     &CORBA::_tc_string);
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_StringValue =
@@ -87,7 +88,7 @@ CORBA::StringValue::_downcast (CORBA::ValueBase *v)
     {
       return 0;
     }
-  
+
   return dynamic_cast< ::CORBA::StringValue * > (v);
 }
 
@@ -100,7 +101,7 @@ CORBA::StringValue::_copy_value (void)
     result,
     StringValue (*this),
     0);
-    
+
   return result;
 }
 
@@ -110,7 +111,7 @@ CORBA::StringValue::_tao_obv_repository_id (void) const
   return this->_tao_obv_static_repository_id ();
 }
 
-CORBA::Boolean 
+CORBA::Boolean
 CORBA::StringValue::_tao_unmarshal (
     TAO_InputCDR &strm,
     StringValue *&vb_object
@@ -125,18 +126,18 @@ CORBA::StringValue::_tao_unmarshal (
     {
       return 0;
     }
-  
+
   vb_object = 0;
   if (is_null_object)
     {
       return 1;
     }
-  
+
   ACE_NEW_RETURN (
     vb_object,
     StringValue,
     0);
-    
+
   return (strm >> vb_object->_pd_value);
 }
 
@@ -153,7 +154,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/CORBA/WStringValue:1.0",
     "WStringValue",
     &CORBA::_tc_wstring);
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_WStringValue =
@@ -171,7 +172,7 @@ CORBA::WStringValue::_downcast (CORBA::ValueBase *v)
     {
       return 0;
     }
-  
+
   return dynamic_cast< ::CORBA::WStringValue * > (v);
 }
 
@@ -184,7 +185,7 @@ CORBA::WStringValue::_copy_value (void)
     result,
     WStringValue (*this),
     0);
-    
+
   return result;
 }
 
@@ -194,7 +195,7 @@ CORBA::WStringValue::_tao_obv_repository_id (void) const
   return this->_tao_obv_static_repository_id ();
 }
 
-CORBA::Boolean 
+CORBA::Boolean
 CORBA::WStringValue::_tao_unmarshal (
     TAO_InputCDR &strm,
     WStringValue *&vb_object
@@ -209,18 +210,18 @@ CORBA::WStringValue::_tao_unmarshal (
     {
       return 0;
     }
-  
+
   vb_object = 0;
   if (is_null_object)
     {
       return 1;
     }
-  
+
   ACE_NEW_RETURN (
     vb_object,
     WStringValue,
     0);
-    
+
   return (strm >> vb_object->_pd_value);
 }
 
@@ -415,13 +416,13 @@ operator>> (
   template class
     TAO_Value_Var_T<
         CORBA::StringValue
-        
+
       >;
-  
+
   template class
     TAO_Value_Out_T<
         CORBA::StringValue
-        
+
       >;
 
   template class
@@ -437,13 +438,13 @@ operator>> (
   template class
     TAO_Value_Var_T<
         CORBA::WStringValue
-        
+
       >;
-  
+
   template class
     TAO_Value_Out_T<
         CORBA::WStringValue
-        
+
       >;
 
   template class
@@ -461,13 +462,13 @@ operator>> (
 # pragma instantiate \
     TAO_Value_Var_T< \
         CORBA::StringValue \
-        
+
       >
-  
+
 # pragma instantiate \
     TAO_Value_Out_T< \
         CORBA::StringValue \
-        
+
       >
 
 # pragma instantiate \
@@ -483,13 +484,13 @@ operator>> (
 # pragma instantiate \
     TAO_Value_Var_T< \
         CORBA::WStringValue \
-        
+
       >
-  
+
 # pragma instantiate \
     TAO_Value_Out_T< \
         CORBA::WStringValue \
-        
+
       >
 
 # pragma instantiate \
@@ -497,4 +498,4 @@ operator>> (
         CORBA::WStringValue \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Valuetype/ValueBase.cpp b/TAO/tao/Valuetype/ValueBase.cpp
index 055eea57e58..3c2e8e8a7aa 100644
--- a/TAO/tao/Valuetype/ValueBase.cpp
+++ b/TAO/tao/Valuetype/ValueBase.cpp
@@ -6,9 +6,10 @@
 #include "tao/ORB.h"
 #include "tao/ORB_Core.h"
 #include "tao/debug.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Value_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Value_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
diff --git a/TAO/tao/Valuetype/ValueBase.h b/TAO/tao/Valuetype/ValueBase.h
index 267f788b990..745bfad5d53 100644
--- a/TAO/tao/Valuetype/ValueBase.h
+++ b/TAO/tao/Valuetype/ValueBase.h
@@ -27,6 +27,7 @@
 
 #include "tao/Object_Argument_T.h"
 #include "tao/Arg_Traits_T.h"
+#include "tao/Any_Insert_Policy_T.h"
 
 #include "ace/Basic_Types.h"
 #include "ace/CORBA_macros.h"
@@ -224,7 +225,9 @@ namespace TAO
     : public Object_Arg_Traits_T<CORBA::ValueBase *,
                                  CORBA::ValueBase_var,
                                  CORBA::ValueBase_out,
-                                 TAO::Value_Traits<CORBA::ValueBase> >
+                                 TAO::Value_Traits<CORBA::ValueBase>,
+                                 TAO::Any_Insert_Policy_Stream <CORBA::ValueBase *>
+                                >
   {
   };
 
diff --git a/TAO/tao/Valuetype_Adapter.cpp b/TAO/tao/Valuetype_Adapter.cpp
index 5c01ab2e031..62594d81764 100644
--- a/TAO/tao/Valuetype_Adapter.cpp
+++ b/TAO/tao/Valuetype_Adapter.cpp
@@ -2,24 +2,11 @@
 
 #include "tao/Valuetype_Adapter.h"
 
-#include "ace/Dynamic_Service.h"
-
-ACE_RCSID (tao, 
-           Valuetype_Adapter, 
+ACE_RCSID (tao,
+           Valuetype_Adapter,
            "$Id$")
 
 TAO_Valuetype_Adapter::~TAO_Valuetype_Adapter (void)
 {
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Dynamic_Service<TAO_Valuetype_Adapter>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Dynamic_Service<TAO_Valuetype_Adapter>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-
diff --git a/TAO/tao/Var_Array_Argument_T.cpp b/TAO/tao/Var_Array_Argument_T.cpp
index c6116ff80f1..97d0b014e02 100644
--- a/TAO/tao/Var_Array_Argument_T.cpp
+++ b/TAO/tao/Var_Array_Argument_T.cpp
@@ -4,7 +4,6 @@
 #define TAO_VAR_ARRAY_ARGUMENT_T_C
 
 #include "tao/Var_Array_Argument_T.h"
-#include "tao/Dynamic_ParameterC.h"
 
 #if !defined (__ACE_INLINE__)
 #include "tao/Var_Array_Argument_T.inl"
@@ -14,9 +13,12 @@ ACE_RCSID (tao,
            Var_Array_Argument_T,
            "$Id$")
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::In_Var_Array_Argument_T<S,S_slice,S_forany>::marshal (
+TAO::In_Var_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::marshal (
     TAO_OutputCDR & cdr
   )
 {
@@ -25,32 +27,39 @@ TAO::In_Var_Array_Argument_T<S,S_slice,S_forany>::marshal (
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 void
-TAO::In_Var_Array_Argument_T<S,S_slice,S_forany>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::In_Var_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_IN;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ===========================================================
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_Var_Array_Argument_T<S,S_slice,S_forany>::marshal (
+TAO::Inout_Var_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::marshal (
     TAO_OutputCDR & cdr
   )
 {
   return cdr << this->x_;
 }
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_Var_Array_Argument_T<S,S_slice,S_forany>::demarshal (
+TAO::Inout_Var_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::demarshal (
     TAO_InputCDR & cdr
   )
 {
@@ -59,14 +68,15 @@ TAO::Inout_Var_Array_Argument_T<S,S_slice,S_forany>::demarshal (
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 void
-TAO::Inout_Var_Array_Argument_T<S,S_slice,S_forany>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::Inout_Var_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_INOUT;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -78,9 +88,10 @@ template<typename S,
          typename S_var,
          typename S_out,
          typename S_forany,
-         typename S_tag>
+         typename S_tag,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Out_Var_Array_Argument_T<S,S_slice,S_var,S_out,S_forany,S_tag>::demarshal (
+TAO::Out_Var_Array_Argument_T<S,S_slice,S_var,S_out,S_forany,S_tag,Insert_Policy>::demarshal (
     TAO_InputCDR & cdr
   )
 {
@@ -99,14 +110,14 @@ template<typename S,
          typename S_var,
          typename S_out,
          typename S_forany,
-         typename S_tag>
+         typename S_tag,
+         typename Insert_Policy>
 void
-TAO::Out_Var_Array_Argument_T<S,S_slice,S_var,S_out,S_forany,S_tag>::
-interceptor_param (Dynamic::Parameter & p)
+TAO::Out_Var_Array_Argument_T<S,S_slice,S_var,S_out,S_forany,S_tag,Insert_Policy>::
+interceptor_value (CORBA::Any *any) const
 {
   S_forany tmp (this->x_);
-  p.argument <<= tmp;
-  p.mode = CORBA::PARAM_OUT;
+  this->Insert_Policy::any_insert (any, tmp);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -117,9 +128,10 @@ template<typename S,
          typename S_slice,
          typename S_var,
          typename S_forany,
-         typename S_tag>
+         typename S_tag,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Ret_Var_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::demarshal (
+TAO::Ret_Var_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag,Insert_Policy>::demarshal (
     TAO_InputCDR & cdr
   )
 {
@@ -139,12 +151,13 @@ template<typename S,
          typename S_slice,
          typename S_var,
          typename S_forany,
-         typename S_tag>
+         typename S_tag,
+         typename Insert_Policy>
 void
-TAO::Ret_Var_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::
-interceptor_result (CORBA::Any * any)
+TAO::Ret_Var_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag,Insert_Policy>::
+interceptor_value (CORBA::Any *any) const
 {
-  (*any) <<= S_forany (this->x_.ptr ());
+  this->Insert_Policy::any_insert (any, S_forany (this->x_.ptr ()));
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
diff --git a/TAO/tao/Var_Array_Argument_T.h b/TAO/tao/Var_Array_Argument_T.h
index 0e411bf87dc..75cb050ecc2 100644
--- a/TAO/tao/Var_Array_Argument_T.h
+++ b/TAO/tao/Var_Array_Argument_T.h
@@ -29,15 +29,18 @@ namespace TAO
    * @brief IN stub argument of variable size element array.
    *
    */
-  template<typename S, typename S_slice, typename S_forany>
-  class In_Var_Array_Argument_T : public Argument
+  template<typename S,
+           typename S_slice,
+           typename S_forany,
+           typename Insert_Policy>
+  class In_Var_Array_Argument_T : public InArgument, private Insert_Policy
   {
   public:
     In_Var_Array_Argument_T (const S_slice * x);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S_slice const * arg (void) const;
 
@@ -51,16 +54,19 @@ namespace TAO
    * @brief INOUT stub argument of variable size element array.
    *
    */
-  template<typename S, typename S_slice, typename S_forany>
-  class Inout_Var_Array_Argument_T : public Argument
+  template<typename S,
+           typename S_slice,
+           typename S_forany,
+           typename Insert_Policy>
+  class Inout_Var_Array_Argument_T : public InoutArgument, private Insert_Policy
   {
   public:
     Inout_Var_Array_Argument_T (S_slice *&x);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S_slice * arg (void);
 
@@ -79,15 +85,16 @@ namespace TAO
            typename S_var,
            typename S_out,
            typename S_forany,
-           typename S_tag>
-  class Out_Var_Array_Argument_T : public Argument
+           typename S_tag,
+           typename Insert_Policy>
+  class Out_Var_Array_Argument_T : public OutArgument, private Insert_Policy
   {
   public:
     Out_Var_Array_Argument_T (S_out x);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S_slice *& arg (void);
 
@@ -105,15 +112,16 @@ namespace TAO
            typename S_slice,
            typename S_var,
            typename S_forany,
-           typename S_tag>
-  class Ret_Var_Array_Argument_T : public Argument
+           typename S_tag,
+           typename Insert_Policy>
+  class Ret_Var_Array_Argument_T : public RetArgument, private Insert_Policy
   {
   public:
     Ret_Var_Array_Argument_T (void);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_result (CORBA::Any *);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S_slice *& arg (void);
 
@@ -143,7 +151,8 @@ namespace TAO
            typename T_var,
            typename T_out,
            typename T_forany,
-           typename T_tag>
+           typename T_tag,
+           typename Insert_Policy>
   struct Var_Array_Arg_Traits_T
   {
     typedef T_slice *                                   ret_type;
@@ -153,21 +162,25 @@ namespace TAO
 
     typedef In_Var_Array_Argument_T<T,
                                     T_slice,
-                                    T_forany>           in_arg_val;
+                                    T_forany,
+                                    Insert_Policy>           in_arg_val;
     typedef Inout_Var_Array_Argument_T<T,
                                        T_slice,
-                                       T_forany>        inout_arg_val;
+                                       T_forany,
+                                       Insert_Policy>        inout_arg_val;
     typedef Out_Var_Array_Argument_T<T,
                                      T_slice,
                                      T_var,
                                      T_out,
                                      T_forany,
-                                     T_tag>             out_arg_val;
+                                     T_tag,
+                                     Insert_Policy>             out_arg_val;
     typedef Ret_Var_Array_Argument_T<T,
                                      T_slice,
                                      T_var,
                                      T_forany,
-                                     T_tag>             ret_val;
+                                     T_tag,
+                                     Insert_Policy>             ret_val;
 
     typedef Var_Array_Tag                               idl_tag;
   };
diff --git a/TAO/tao/Var_Array_Argument_T.inl b/TAO/tao/Var_Array_Argument_T.inl
index a189584da2e..072b68039fc 100644
--- a/TAO/tao/Var_Array_Argument_T.inl
+++ b/TAO/tao/Var_Array_Argument_T.inl
@@ -2,34 +2,48 @@
 //
 // $Id$
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::In_Var_Array_Argument_T<S,S_slice,S_forany>::
+TAO::In_Var_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::
 In_Var_Array_Argument_T (const S_slice * x)
   : x_ (const_cast<S_slice *> (x))
-{}
+{
+}
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 ACE_INLINE
 S_slice const *
-TAO::In_Var_Array_Argument_T<S,S_slice,S_forany>::arg (void) const
+TAO::In_Var_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::arg (void) const
 {
   return this->x_.in ();
 }
 
 // ==========================================================================
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Inout_Var_Array_Argument_T<S,S_slice,S_forany>::
+TAO::Inout_Var_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::
 Inout_Var_Array_Argument_T (S_slice  *&x)
   : x_ (x)
-{}
+{
+}
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 ACE_INLINE
 S_slice *
-TAO::Inout_Var_Array_Argument_T<S,S_slice,S_forany>::arg (void)
+TAO::Inout_Var_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::arg (void)
 {
   return this->x_.inout ();
 }
@@ -41,9 +55,10 @@ template<typename S,
          typename S_var,
          typename S_out,
          typename S_forany,
-         typename S_tag>
+         typename S_tag,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Out_Var_Array_Argument_T<S,S_slice,S_var,S_out,S_forany,S_tag>::
+TAO::Out_Var_Array_Argument_T<S,S_slice,S_var,S_out,S_forany,S_tag,Insert_Policy>::
 Out_Var_Array_Argument_T (S_out x)
   : x_ (x.ptr ())
 {
@@ -54,10 +69,11 @@ template<typename S,
          typename S_var,
          typename S_out,
          typename S_forany,
-         typename S_tag>
+         typename S_tag,
+         typename Insert_Policy>
 ACE_INLINE
 S_slice *&
-TAO::Out_Var_Array_Argument_T<S,S_slice,S_var,S_out,S_forany,S_tag>::arg (void)
+TAO::Out_Var_Array_Argument_T<S,S_slice,S_var,S_out,S_forany,S_tag,Insert_Policy>::arg (void)
 {
   return this->x_;
 }
@@ -68,9 +84,10 @@ template<typename S,
          typename S_slice,
          typename S_var,
          typename S_forany,
-         typename S_tag>
+         typename S_tag,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Ret_Var_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::
+TAO::Ret_Var_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag,Insert_Policy>::
 Ret_Var_Array_Argument_T (void)
 {}
 
@@ -78,10 +95,11 @@ template<typename S,
          typename S_slice,
          typename S_var,
          typename S_forany,
-         typename S_tag>
+         typename S_tag,
+         typename Insert_Policy>
 ACE_INLINE
 S_slice *&
-TAO::Ret_Var_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::arg (void)
+TAO::Ret_Var_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag,Insert_Policy>::arg (void)
 {
   return this->x_.out ();
 }
@@ -90,10 +108,11 @@ template<typename S,
          typename S_slice,
          typename S_var,
          typename S_forany,
-         typename S_tag>
+         typename S_tag,
+         typename Insert_Policy>
 ACE_INLINE
 S_slice *
-TAO::Ret_Var_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::excp (void)
+TAO::Ret_Var_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag,Insert_Policy>::excp (void)
 {
   return this->x_.ptr ();
 }
@@ -102,10 +121,11 @@ template<typename S,
          typename S_slice,
          typename S_var,
          typename S_forany,
-         typename S_tag>
+         typename S_tag,
+         typename Insert_Policy>
 ACE_INLINE
 S_slice *
-TAO::Ret_Var_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::retn (void)
+TAO::Ret_Var_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag,Insert_Policy>::retn (void)
 {
   return this->x_._retn ();
 }
diff --git a/TAO/tao/Var_Size_Argument_T.cpp b/TAO/tao/Var_Size_Argument_T.cpp
index 5d28dae9742..290c17b4909 100644
--- a/TAO/tao/Var_Size_Argument_T.cpp
+++ b/TAO/tao/Var_Size_Argument_T.cpp
@@ -4,7 +4,6 @@
 #define TAO_VAR_SIZE_ARGUMENT_T_C
 
 #include "tao/Var_Size_Argument_T.h"
-#include "tao/Dynamic_ParameterC.h"
 
 #if !defined (__ACE_INLINE__)
 #include "tao/Var_Size_Argument_T.inl"
@@ -14,58 +13,63 @@ ACE_RCSID (tao,
            Var_Size_Argument_T,
            "$Id$")
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::In_Var_Size_Argument_T<S>::marshal (TAO_OutputCDR & cdr)
+TAO::In_Var_Size_Argument_T<S,Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << *this->x_;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 void
-TAO::In_Var_Size_Argument_T<S>::interceptor_param (Dynamic::Parameter & p)
+TAO::In_Var_Size_Argument_T<S,Insert_Policy>::interceptor_value (CORBA::Any *any) const
 {
-  p.argument <<= *this->x_;
-  p.mode = CORBA::PARAM_IN;
+  this->Insert_Policy::any_insert (any, *this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ===========================================================
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_Var_Size_Argument_T<S>::marshal (TAO_OutputCDR & cdr)
+TAO::Inout_Var_Size_Argument_T<S,Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << *this->x_;
 }
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_Var_Size_Argument_T<S>::demarshal (TAO_InputCDR & cdr)
+TAO::Inout_Var_Size_Argument_T<S,Insert_Policy>::demarshal (TAO_InputCDR & cdr)
 {
   return cdr >> *this->x_;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 void
-TAO::Inout_Var_Size_Argument_T<S>::interceptor_param (Dynamic::Parameter & p)
+TAO::Inout_Var_Size_Argument_T<S,Insert_Policy>::interceptor_value (CORBA::Any *any) const
 {
-  p.argument <<= *this->x_;
-  p.mode = CORBA::PARAM_INOUT;
+  this->Insert_Policy::any_insert (any, *this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ==============================================================
 
-template<typename S, typename S_out>
+template<typename S,
+         typename S_out,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Out_Var_Size_Argument_T<S,S_out>::demarshal (TAO_InputCDR & cdr)
+TAO::Out_Var_Size_Argument_T<S,S_out,Insert_Policy>::demarshal (TAO_InputCDR & cdr)
 {
   this->x_ = new S;
   return cdr >> *this->x_;
@@ -73,23 +77,24 @@ TAO::Out_Var_Size_Argument_T<S,S_out>::demarshal (TAO_InputCDR & cdr)
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, typename S_out>
+template<typename S,
+         typename S_out,
+         typename Insert_Policy>
 void
-TAO::Out_Var_Size_Argument_T<S,S_out>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::Out_Var_Size_Argument_T<S,S_out,Insert_Policy>::interceptor_value (CORBA::Any *any) const
 {
-  p.argument <<= *this->x_;
-  p.mode = CORBA::PARAM_OUT;
+  this->Insert_Policy::any_insert (any, *this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ============================================================
 
-template<typename S, typename S_var>
+template<typename S,
+         typename S_var,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Ret_Var_Size_Argument_T<S,S_var>::demarshal (TAO_InputCDR & cdr)
+TAO::Ret_Var_Size_Argument_T<S,S_var,Insert_Policy>::demarshal (TAO_InputCDR & cdr)
 {
   S * tmp = 0;
   ACE_NEW_RETURN (tmp,
@@ -101,11 +106,13 @@ TAO::Ret_Var_Size_Argument_T<S,S_var>::demarshal (TAO_InputCDR & cdr)
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, typename S_var>
+template<typename S,
+         typename S_var,
+         typename Insert_Policy>
 void
-TAO::Ret_Var_Size_Argument_T<S,S_var>::interceptor_result (CORBA::Any * any)
+TAO::Ret_Var_Size_Argument_T<S,S_var,Insert_Policy>::interceptor_value (CORBA::Any *any) const
 {
-  (*any) <<= this->x_.in ();
+  this->Insert_Policy::any_insert (any, this->x_.in ());
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
diff --git a/TAO/tao/Var_Size_Argument_T.h b/TAO/tao/Var_Size_Argument_T.h
index e417f5b72fe..fa1afc31536 100644
--- a/TAO/tao/Var_Size_Argument_T.h
+++ b/TAO/tao/Var_Size_Argument_T.h
@@ -29,15 +29,15 @@ namespace TAO
    * @brief Template class for IN stub argument of fixed size IDL types.
    *
    */
-  template<typename S>
-  class In_Var_Size_Argument_T : public Argument
+  template<typename S, typename Insert_Policy>
+  class In_Var_Size_Argument_T : public InArgument, private Insert_Policy
   {
   public:
     In_Var_Size_Argument_T (S const & x);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S const & arg (void) const;
 
@@ -51,16 +51,16 @@ namespace TAO
    * @brief Template class for INOUT stub argument of fixed size IDL types.
    *
    */
-  template<typename S>
-  class Inout_Var_Size_Argument_T : public Argument
+  template<typename S, typename Insert_Policy>
+  class Inout_Var_Size_Argument_T : public InoutArgument, private Insert_Policy
   {
   public:
     Inout_Var_Size_Argument_T (S & x);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S & arg (void);
 
@@ -74,15 +74,15 @@ namespace TAO
    * @brief Template class for OUT stub argument of fixed size IDL types.
    *
    */
-  template<typename S, typename S_out>
-  class Out_Var_Size_Argument_T : public Argument
+  template<typename S, typename S_out, typename Insert_Policy>
+  class Out_Var_Size_Argument_T : public OutArgument, private Insert_Policy
   {
   public:
     Out_Var_Size_Argument_T (S_out x);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S *& arg (void);
 
@@ -96,15 +96,15 @@ namespace TAO
    * @brief Template class for return stub value of fixed size IDL types.
    *
    */
-  template<typename S, typename S_var>
-  class Ret_Var_Size_Argument_T : public Argument
+  template<typename S, typename S_var, typename Insert_Policy>
+  class Ret_Var_Size_Argument_T : public RetArgument, private Insert_Policy
   {
   public:
     Ret_Var_Size_Argument_T (void);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_result (CORBA::Any *);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S *& arg (void);
 
@@ -124,13 +124,13 @@ namespace TAO
   struct TAO_Export Var_Size_Tag {};
 
   /**
-   * @struct Basic_Arg_Traits_T
+   * @struct Var_Size_Arg_Traits_T
    *
    * @brief Template class for stub argument traits of
    *  variable size IDL types.
    *
    */
-  template<typename T, typename T_var, typename T_out>
+  template<typename T, typename T_var, typename T_out, typename Insert_Policy>
   struct Var_Size_Arg_Traits_T
   {
     typedef T *                                         ret_type;
@@ -138,10 +138,10 @@ namespace TAO
     typedef T &                                         inout_type;
     typedef T_out                                       out_type;
 
-    typedef In_Var_Size_Argument_T<T>                   in_arg_val;
-    typedef Inout_Var_Size_Argument_T<T>                inout_arg_val;
-    typedef Out_Var_Size_Argument_T<T,T_out>            out_arg_val;
-    typedef Ret_Var_Size_Argument_T<T,T_var>            ret_val;
+    typedef In_Var_Size_Argument_T<T, Insert_Policy>          in_arg_val;
+    typedef Inout_Var_Size_Argument_T<T, Insert_Policy>       inout_arg_val;
+    typedef Out_Var_Size_Argument_T<T,T_out, Insert_Policy>   out_arg_val;
+    typedef Ret_Var_Size_Argument_T<T,T_var, Insert_Policy>   ret_val;
 
     typedef Var_Size_Tag                                idl_tag;
   };
diff --git a/TAO/tao/Var_Size_Argument_T.inl b/TAO/tao/Var_Size_Argument_T.inl
index 59ad3bdbbfa..b5c240dfa8a 100644
--- a/TAO/tao/Var_Size_Argument_T.inl
+++ b/TAO/tao/Var_Size_Argument_T.inl
@@ -1,78 +1,97 @@
 // $Id$
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::In_Var_Size_Argument_T<S>::In_Var_Size_Argument_T (S const & x)
+TAO::In_Var_Size_Argument_T<S,Insert_Policy>::In_Var_Size_Argument_T (S const & x)
   : x_ (&x)
-{}
+{
+}
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 ACE_INLINE
 const S &
-TAO::In_Var_Size_Argument_T<S>::arg (void) const
+TAO::In_Var_Size_Argument_T<S,Insert_Policy>::arg (void) const
 {
   return *this->x_;
 }
 
 // ==========================================================================
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Inout_Var_Size_Argument_T<S>::Inout_Var_Size_Argument_T (S & x)
+TAO::Inout_Var_Size_Argument_T<S,Insert_Policy>::Inout_Var_Size_Argument_T (S & x)
   : x_ (&x)
-{}
+{
+}
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 ACE_INLINE
 S &
-TAO::Inout_Var_Size_Argument_T<S>::arg (void)
+TAO::Inout_Var_Size_Argument_T<S,Insert_Policy>::arg (void)
 {
   return *this->x_;
 }
 
 // ==========================================================================
 
-template<typename S, typename S_out>
+template<typename S,
+         typename S_out,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Out_Var_Size_Argument_T<S,S_out>::Out_Var_Size_Argument_T (S_out x)
+TAO::Out_Var_Size_Argument_T<S,S_out,Insert_Policy>::Out_Var_Size_Argument_T (S_out x)
   : x_ (x.ptr ())
 {}
 
-template<typename S, typename S_out>
+template<typename S,
+         typename S_out,
+         typename Insert_Policy>
 ACE_INLINE
 S *&
-TAO::Out_Var_Size_Argument_T<S,S_out>::arg (void)
+TAO::Out_Var_Size_Argument_T<S,S_out,Insert_Policy>::arg (void)
 {
   return this->x_;
 }
 
 // ==========================================================================
 
-template<typename S, typename S_var>
+template<typename S,
+         typename S_var,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Ret_Var_Size_Argument_T<S,S_var>::Ret_Var_Size_Argument_T (void)
-{}
+TAO::Ret_Var_Size_Argument_T<S,S_var,Insert_Policy>::Ret_Var_Size_Argument_T (void)
+{
+}
 
-template<typename S, typename S_var>
+template<typename S,
+         typename S_var,
+         typename Insert_Policy>
 ACE_INLINE
 S *&
-TAO::Ret_Var_Size_Argument_T<S,S_var>::arg (void)
+TAO::Ret_Var_Size_Argument_T<S,S_var,Insert_Policy>::arg (void)
 {
   return this->x_.out ();
 }
 
-template<typename S, typename S_var>
+template<typename S,
+         typename S_var,
+         typename Insert_Policy>
 ACE_INLINE
 S *
-TAO::Ret_Var_Size_Argument_T<S,S_var>::excp (void)
+TAO::Ret_Var_Size_Argument_T<S,S_var,Insert_Policy>::excp (void)
 {
   return this->x_.ptr ();
 }
 
-template<typename S, typename S_var>
+template<typename S,
+         typename S_var,
+         typename Insert_Policy>
 ACE_INLINE
 S *
-TAO::Ret_Var_Size_Argument_T<S,S_var>::retn (void)
+TAO::Ret_Var_Size_Argument_T<S,S_var,Insert_Policy>::retn (void)
 {
   return this->x_._retn ();
 }
diff --git a/TAO/tao/Visibility.pidl b/TAO/tao/Visibility.pidl
deleted file mode 100644
index 44cece777a3..00000000000
--- a/TAO/tao/Visibility.pidl
+++ /dev/null
@@ -1,34 +0,0 @@
-// -*- IDL -*-
-
-// ================================================================
-/**
- *  @file   Visibility.pidl
- *
- * $Id$
- *
- *   This file was used to generate the code in VisibiltyC.* The command
- *   used to generate code is:
- *
- *     tao_idl
- *        -o orig -SS -Ge 1 -Sc -Sci
- *          -Wb,export_macro=TAO_Export
- *          -Wb,export_include="tao/TAO_Export.h"
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          Visibilty.pidl
- */
-// ================================================================
-
-#ifndef TAO_VISIBILITY_PIDL
-#define TAO_VISIBILITY_PIDL
-
-#pragma prefix "omg.org"
-
-module CORBA
-{
-  typedef short Visibility;
-  const Visibility PRIVATE_MEMBER = 0;
-  const Visibility PUBLIC_MEMBER = 1;
-};
-
-#endif /* TAO_VISIBILITY_PIDL */
diff --git a/TAO/tao/VisibilityS.h b/TAO/tao/VisibilityS.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/VisibilityS.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- 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/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/WCharSeqA.cpp b/TAO/tao/WCharSeqA.cpp
deleted file mode 100644
index 5f79ab8d2bf..00000000000
--- a/TAO/tao/WCharSeqA.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-// -*- 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/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "WCharSeqC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_CORBA_WCharSeq_GUARD
-#define _TAO_TYPECODE_CORBA_WCharSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_WCharSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_wchar,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_WCharSeq_0 =
-      &CORBA_WCharSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_WCharSeq_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_WCharSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/WCharSeq:1.0",
-    "WCharSeq",
-    &TAO::TypeCode::tc_CORBA_WCharSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_WCharSeq =
-    &_tao_tc_CORBA_WCharSeq;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::WCharSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::WCharSeq>::insert_copy (
-      _tao_any,
-      CORBA::WCharSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_WCharSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::WCharSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::WCharSeq>::insert (
-      _tao_any,
-      CORBA::WCharSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_WCharSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::WCharSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::WCharSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::WCharSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::WCharSeq>::extract (
-        _tao_any,
-        CORBA::WCharSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_WCharSeq_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/WCharSeqC.cpp b/TAO/tao/WCharSeqC.cpp
index 7be0ffd9c3d..2ec0b1bd9e0 100644
--- a/TAO/tao/WCharSeqC.cpp
+++ b/TAO/tao/WCharSeqC.cpp
@@ -26,16 +26,12 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:288
 
 
 #include "WCharSeqC.h"
 #include "tao/CDR.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
diff --git a/TAO/tao/WCharSeqC.h b/TAO/tao/WCharSeqC.h
index 66e272a3891..a757c0b021c 100644
--- a/TAO/tao/WCharSeqC.h
+++ b/TAO/tao/WCharSeqC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_WCHARSEQC_H_
-#define _TAO_IDL_ORIG_WCHARSEQC_H_
+#ifndef _TAO_IDL_WCHARSEQC_H_
+#define _TAO_IDL_WCHARSEQC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -57,12 +57,8 @@
 #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
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace CORBA
 {
@@ -114,14 +110,9 @@ namespace CORBA
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_WCharSeq;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module CORBA
 
@@ -134,14 +125,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::WCharSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::WCharSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::WCharSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::WCharSeq *&);
-
-// TAO_IDL - Generated from
 // be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_CORBA_WCharSeq_H_
@@ -159,16 +142,12 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_WCharSeq_H_ */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
+// be\be_codegen.cpp:1062
 
 #if defined(_MSC_VER)
 #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/WStringSeqA.cpp b/TAO/tao/WStringSeqA.cpp
deleted file mode 100644
index 319557ee39c..00000000000
--- a/TAO/tao/WStringSeqA.cpp
+++ /dev/null
@@ -1,143 +0,0 @@
-// -*- 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/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "WStringSeqC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_CORBA_WStringSeq_GUARD
-#define _TAO_TYPECODE_CORBA_WStringSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_WStringSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_wstring,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_WStringSeq_0 =
-      &CORBA_WStringSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_WStringSeq_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_WStringSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/WStringSeq:1.0",
-    "WStringSeq",
-    &TAO::TypeCode::tc_CORBA_WStringSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_WStringSeq =
-    &_tao_tc_CORBA_WStringSeq;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::WStringSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::WStringSeq>::insert_copy (
-      _tao_any,
-      CORBA::WStringSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_WStringSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::WStringSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::WStringSeq>::insert (
-      _tao_any,
-      CORBA::WStringSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_WStringSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::WStringSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::WStringSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::WStringSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::WStringSeq>::extract (
-        _tao_any,
-        CORBA::WStringSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_WStringSeq_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/WStringSeqC.cpp b/TAO/tao/WStringSeqC.cpp
index fd19f744d9f..98e4b6cd4bb 100644
--- a/TAO/tao/WStringSeqC.cpp
+++ b/TAO/tao/WStringSeqC.cpp
@@ -26,16 +26,12 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
 #include "WStringSeqC.h"
 #include "tao/CDR.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
diff --git a/TAO/tao/WStringSeqC.h b/TAO/tao/WStringSeqC.h
index c73b0347014..e63489ccfa7 100644
--- a/TAO/tao/WStringSeqC.h
+++ b/TAO/tao/WStringSeqC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_WSTRINGSEQC_H_
-#define _TAO_IDL_ORIG_WSTRINGSEQC_H_
+#ifndef _TAO_IDL_WSTRINGSEQC_H_
+#define _TAO_IDL_WSTRINGSEQC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -52,17 +52,8 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#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
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace CORBA
 {
@@ -112,14 +103,9 @@ namespace CORBA
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_WStringSeq;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module CORBA
 
@@ -132,14 +118,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::WStringSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::WStringSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::WStringSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::WStringSeq *&);
-
-// TAO_IDL - Generated from
 // be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_CORBA_WStringSeq_H_
@@ -157,15 +135,7 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_WStringSeq_H_ */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+// be\be_codegen.cpp:1028
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/Wait_On_LF_No_Upcall.h b/TAO/tao/Wait_On_LF_No_Upcall.h
index bfc9f56640e..d2ea3b899f8 100644
--- a/TAO/tao/Wait_On_LF_No_Upcall.h
+++ b/TAO/tao/Wait_On_LF_No_Upcall.h
@@ -38,7 +38,7 @@ namespace TAO
    * reset once the reply is received.
    */
 
-  class TAO_Export Wait_On_LF_No_Upcall : public TAO_Wait_On_Leader_Follower
+  class Wait_On_LF_No_Upcall : public TAO_Wait_On_Leader_Follower
   {
   public:
 
diff --git a/TAO/tao/Wait_On_Leader_Follower.h b/TAO/tao/Wait_On_Leader_Follower.h
index fd815ef4862..5db60e5808b 100644
--- a/TAO/tao/Wait_On_Leader_Follower.h
+++ b/TAO/tao/Wait_On_Leader_Follower.h
@@ -35,7 +35,7 @@
  * is Muxed and hence there are multiple threads running in the
  * same Transport context.
  */
-class TAO_Export TAO_Wait_On_Leader_Follower : public TAO_Wait_Strategy
+class TAO_Wait_On_Leader_Follower : public TAO_Wait_Strategy
 {
 
 public:
diff --git a/TAO/tao/Wait_On_Reactor.h b/TAO/tao/Wait_On_Reactor.h
index c8af5477fba..566a419efd1 100644
--- a/TAO/tao/Wait_On_Reactor.h
+++ b/TAO/tao/Wait_On_Reactor.h
@@ -28,7 +28,7 @@
  * environment.
  *
  */
-class TAO_Export TAO_Wait_On_Reactor : public TAO_Wait_Strategy
+class TAO_Wait_On_Reactor : public TAO_Wait_Strategy
 {
 
 public:
diff --git a/TAO/tao/Wait_On_Read.h b/TAO/tao/Wait_On_Read.h
index d2de502871f..e946f07d4a3 100644
--- a/TAO/tao/Wait_On_Read.h
+++ b/TAO/tao/Wait_On_Read.h
@@ -27,7 +27,7 @@
  *
  * Simply block on read() to wait for the reply.
  */
-class TAO_Export TAO_Wait_On_Read :  public TAO_Wait_Strategy
+class TAO_Wait_On_Read :  public TAO_Wait_Strategy
 {
 
 public:
diff --git a/TAO/tao/Wait_Strategy.h b/TAO/tao/Wait_Strategy.h
index b38dc77b7a9..88e80011167 100644
--- a/TAO/tao/Wait_Strategy.h
+++ b/TAO/tao/Wait_Strategy.h
@@ -15,12 +15,14 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/TAO_Export.h"
+#include "tao/orbconf.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/TAO_Export.h"
+
 class ACE_Time_Value;
 class TAO_ORB_Core;
 class TAO_Transport;
diff --git a/TAO/tao/WrongTransactionA.cpp b/TAO/tao/WrongTransactionA.cpp
deleted file mode 100644
index 83780fd5442..00000000000
--- a/TAO/tao/WrongTransactionA.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
-// -*- 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/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "WrongTransactionC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_CORBA_WrongTransaction = 0;
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_WrongTransaction (
-    CORBA::tk_except,
-    "IDL:omg.org/CORBA/WrongTransaction:1.0",
-    "WrongTransaction",
-    _tao_fields_CORBA_WrongTransaction,
-    0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_WrongTransaction =
-    &_tao_tc_CORBA_WrongTransaction;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<CORBA::WrongTransaction>::demarshal_value (
-      TAO_InputCDR & cdr
-    )
-  {
-    CORBA::String_var id;
-    
-    if (!(cdr >> id.out ()))
-      {
-        return false;
-      }
-    
-    ACE_TRY_NEW_ENV
-      {
-        this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-      }
-    ACE_CATCHANY
-      {
-        return false;
-      }
-    ACE_ENDTRY;
-    
-    return true;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::WrongTransaction &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::WrongTransaction>::insert_copy (
-      _tao_any,
-      CORBA::WrongTransaction::_tao_any_destructor,
-      CORBA::_tc_WrongTransaction,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::WrongTransaction *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::WrongTransaction>::insert (
-      _tao_any,
-      CORBA::WrongTransaction::_tao_any_destructor,
-      CORBA::_tc_WrongTransaction,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::WrongTransaction *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::WrongTransaction *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::WrongTransaction *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::WrongTransaction>::extract (
-        _tao_any,
-        CORBA::WrongTransaction::_tao_any_destructor,
-        CORBA::_tc_WrongTransaction,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/WrongTransactionC.cpp b/TAO/tao/WrongTransactionC.cpp
index 97721c038ef..3ca279cf001 100644
--- a/TAO/tao/WrongTransactionC.cpp
+++ b/TAO/tao/WrongTransactionC.cpp
@@ -33,6 +33,8 @@
 #include "tao/CDR.h"
 #include "tao/SystemException.h"
 #include "ace/OS_NS_string.h"
+#include "tao/AnyTypeCode_Adapter.h"
+#include "ace/Dynamic_Service.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -47,7 +49,7 @@ namespace TAO
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 CORBA::WrongTransaction::WrongTransaction (void)
@@ -129,7 +131,7 @@ void CORBA::WrongTransaction::_tao_encode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -142,14 +144,27 @@ void CORBA::WrongTransaction::_tao_decode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
 // TAO extension - the virtual _type method.
 CORBA::TypeCode_ptr CORBA::WrongTransaction::_tao_type (void) const
 {
-  return ::CORBA::_tc_WrongTransaction;
+  TAO_AnyTypeCode_Adapter *adapter =
+    ACE_Dynamic_Service<TAO_AnyTypeCode_Adapter>::instance (
+        "AnyTypeCode_Adapter"
+      );
+  if (adapter != 0)
+    return adapter->_tao_type_WrongTransaction ();
+  else
+    {
+      ACE_ERROR ((LM_ERROR,
+                  ACE_TEXT ("(%P|%t) %p\n"),
+                  ACE_TEXT ("Unable to find the ")
+                  ACE_TEXT ("AnyTypeCode Adapter instance")));
+      return 0;
+    }
 }
 
 // TAO_IDL - Generated from
diff --git a/TAO/tao/WrongTransactionC.h b/TAO/tao/WrongTransactionC.h
index e17d3e6099d..a872bfdfaf2 100644
--- a/TAO/tao/WrongTransactionC.h
+++ b/TAO/tao/WrongTransactionC.h
@@ -63,30 +63,30 @@
 
 namespace CORBA
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_exception/exception_ch.cpp:53
 
 #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 WrongTransaction *_downcast (CORBA::Exception *);
     static const WrongTransaction *_downcast (CORBA::Exception const *);
-    
+
     static CORBA::Exception *_alloc (void);
-    
+
     virtual CORBA::Exception *_tao_duplicate (void) const;
 
     virtual void _raise (void) const;
@@ -95,22 +95,17 @@ namespace CORBA
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL
       ) const;
-    
+
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:129
-    
+
     virtual CORBA::TypeCode_ptr _tao_type (void) const;
   };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_WrongTransaction;
 
 #endif /* end #if !defined */
 
@@ -128,14 +123,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// 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
 // be\be_visitor_exception/cdr_op_ch.cpp:52
 
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::WrongTransaction &);
diff --git a/TAO/tao/append.cpp b/TAO/tao/append.cpp
deleted file mode 100644
index da48f4bb43f..00000000000
--- a/TAO/tao/append.cpp
+++ /dev/null
@@ -1,1318 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-//
-// = FILENAME
-//     append.cpp
-//
-// = DESCRIPTION
-//     Appends a CDR stream to another CDR stream. Due to the
-//     stringent alignment requirements, it is not possible to simply
-//     append or memcpy. Instead we go thru the same CDR encoding rules
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems Inc.
-//     and Aniruddha Gokhale
-//
-// ============================================================================
-
-#include "tao/Environment.h"
-#include "tao/debug.h"
-#include "tao/Valuetype_Adapter.h"
-#include "tao/ORB_Core.h"
-#include "tao/TypeCode.h"
-#include "tao/Marshal.h"
-#include "tao/Any_Unknown_IDL_Type.h"
-#include "tao/CDR.h"
-#include "tao/SystemException.h"
-#include "tao/TypeCode_Constants.h"
-
-#include "ace/Dynamic_Service.h"
-
-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,
-// the TypeCode interpreter is used to recursively encode its
-// components.  "context" is the marshaling stream on which to encode
-// the data value.
-
-TAO::traverse_status
-TAO_Marshal_Primitive::append (CORBA::TypeCode_ptr tc,
-                               TAO_InputCDR *src,
-                               TAO_OutputCDR *dest
-                               ACE_ENV_ARG_DECL)
-{
-  CORBA::Boolean continue_append = 1;
-  TAO::traverse_status retval =
-    TAO::TRAVERSE_CONTINUE; // status of encode operation
-
-  CORBA::TCKind const k = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  switch (k)
-    {
-    case CORBA::tk_null:
-    case CORBA::tk_void:
-      break;
-    case CORBA::tk_short:
-    case CORBA::tk_ushort:
-      continue_append = dest->append_short (*src);
-      break;
-    case CORBA::tk_long:
-    case CORBA::tk_ulong:
-    case CORBA::tk_float:
-    case CORBA::tk_enum:
-      continue_append = dest->append_long (*src);
-      break;
-    case CORBA::tk_double:
-    case CORBA::tk_longlong:
-    case CORBA::tk_ulonglong:
-      continue_append = dest->append_double (*src);
-      break;
-    case CORBA::tk_boolean:
-      continue_append = dest->append_boolean (*src);
-      break;
-    case CORBA::tk_char:
-    case CORBA::tk_octet:
-      continue_append = dest->append_octet (*src);
-      break;
-    case CORBA::tk_longdouble:
-      continue_append = dest->append_longdouble (*src);
-      break;
-    case CORBA::tk_wchar:
-      continue_append = dest->append_wchar (*src);
-      break;
-    default:
-      retval = TAO::TRAVERSE_STOP;
-      // we are not a primitive type
-    }
-
-  if (retval == TAO::TRAVERSE_CONTINUE
-      && continue_append == 1)
-    return TAO::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((
-        LM_DEBUG,
-        ACE_TEXT ("TAO_Marshal_Primitive::append detected error\n")
-      ));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
-}
-
-TAO::traverse_status
-TAO_Marshal_Any::append (CORBA::TypeCode_ptr,
-                         TAO_InputCDR *src,
-                         TAO_OutputCDR *dest
-                         ACE_ENV_ARG_DECL)
-{
-  // Typecode of the element that makes the Any.
-  CORBA::TypeCode_var elem_tc;
-
-  if (!(*src >> elem_tc.inout ()))
-    ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                      CORBA::COMPLETED_MAYBE),
-                      TAO::TRAVERSE_STOP);
-
-  if (!(*dest << elem_tc.in ()))
-    ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                      CORBA::COMPLETED_MAYBE),
-                      TAO::TRAVERSE_STOP);
-
-  // append the data
-  TAO::traverse_status retval =
-    TAO_Marshal_Object::perform_append (elem_tc.in (),
-                                        src,
-                                        dest
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  if (retval != TAO::TRAVERSE_CONTINUE)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO_Marshal_Any::append detected error\n")));
-
-      ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                        CORBA::COMPLETED_MAYBE),
-                        TAO::TRAVERSE_STOP);
-    }
-
-  return retval;
-}
-
-TAO::traverse_status
-TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr,
-                              TAO_InputCDR *src,
-                              TAO_OutputCDR *dest
-                              ACE_ENV_ARG_DECL)
-{
-  CORBA::Boolean continue_append = 1;
-  TAO::traverse_status retval =
-    TAO::TRAVERSE_CONTINUE;
-  CORBA::ULong kind;
-
-  // Decode the "kind" field of the typecode from the src for further
-  // use. However, also write it back into the destination
-  continue_append = (CORBA::Boolean) (src->read_ulong (kind)
-                                      ? dest->write_ulong (kind)
-                                      : 0);
-
-  if (continue_append == 1)
-    {
-      // Typecodes with empty parameter lists all have preallocated
-      // constants.  We use those to reduce memory consumption and
-      // heap access ... also, to speed things up!
-      if ((kind < CORBA::TAO_TC_KIND_COUNT)
-          || (kind == ~0u))
-        {
-          // Either a non-constant typecode or an indirected typecode.
-          switch (kind)
-            {
-              // Need special handling for all kinds of typecodes that
-              // have nonempty parameter lists ...
-            default:
-              // nothing to de done
-              break;
-            case CORBA::tk_string:
-            case CORBA::tk_wstring:
-              {
-                // read and write the bounds
-                retval =
-                  TAO_Marshal_Object::perform_append (CORBA::_tc_long,
-                                                      src,
-                                                      dest
-                                                      ACE_ENV_ARG_PARAMETER);
-                ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-              }
-            break;
-
-            // Indirected typecodes, illegal at "top level"
-            case ~0u:
-              {
-                // read and write the negative offset
-                retval =
-                  TAO_Marshal_Object::perform_append (CORBA::_tc_long,
-                                                      src,
-                                                      dest
-                                                      ACE_ENV_ARG_PARAMETER);
-                ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-              }
-            break;
-
-            // The rest have "complex" parameter lists that are
-            // encoded as bulk octets ...
-            case CORBA::tk_objref:
-            case CORBA::tk_struct:
-            case CORBA::tk_union:
-            case CORBA::tk_enum:
-            case CORBA::tk_sequence:
-            case CORBA::tk_array:
-            case CORBA::tk_alias:
-            case CORBA::tk_except:
-            case CORBA::tk_value:
-            case CORBA::tk_value_box:
-            case CORBA::tk_native:
-            case CORBA::tk_abstract_interface:
-            case CORBA::tk_local_interface:
-            case CORBA::tk_component:
-            case CORBA::tk_home:
-            case CORBA::tk_event:
-              {
-                // write the encapsulation i.e., octet sequence
-                retval =
-                  TAO_Marshal_Object::perform_append (CORBA::_tc_OctetSeq,
-                                                      src,
-                                                      dest
-                                                      ACE_ENV_ARG_PARAMETER);
-                ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-              }
-            } // end of switch
-        }
-      else // bad kind_ value to be decoded
-        {
-          if (TAO_debug_level > 0)
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("TAO_Marshal_TypeCode: ")
-                          ACE_TEXT ("Bad kind_ value in CDR stream\n")));
-            }
-
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
-                            TAO::TRAVERSE_STOP);
-        }
-    }
-
-  if (continue_append == 1 && retval == TAO::TRAVERSE_CONTINUE)
-    {
-      return TAO::TRAVERSE_CONTINUE;
-    }
-
-  if (TAO_debug_level > 0)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO_Marshal_TypeCode::append detected error\n")));
-    }
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
-}
-
-TAO::traverse_status
-TAO_Marshal_Principal::append (CORBA::TypeCode_ptr,
-                               TAO_InputCDR *src,
-                               TAO_OutputCDR *dest
-                               ACE_ENV_ARG_DECL)
-{
-  // write the octet sequence representing the Principal
-  return TAO_Marshal_Object::perform_append (CORBA::_tc_OctetSeq,
-                                             src,
-                                             dest
-                                             ACE_ENV_ARG_PARAMETER);
-}
-
-TAO::traverse_status
-TAO_Marshal_ObjRef::append (CORBA::TypeCode_ptr,
-                            TAO_InputCDR *src,
-                            TAO_OutputCDR *dest
-                            ACE_ENV_ARG_DECL)
-{
-  CORBA::Boolean continue_append = 1;
-
-  // First, append the type hint. This will be the type_id encoded in an
-  // object reference.
-  dest->append_string (*src);
-
-  // Read the profiles, discarding all until an IIOP profile comes by.
-  // Once we see an IIOP profile, ignore any further ones.
-  //
-  // XXX this will need to change someday to let different protocol
-  // code be accessed, not just IIOP.  Protocol modules will be
-  // dynamically loaded from shared libraries via ORB_init (), and we
-  // just need to be able to access such preloaded libraries here as
-  // we unmarshal objrefs.
-
-  CORBA::ULong profiles = 0;
-
-  // get the count of profiles that follow. This will tell us the
-  // length of the sequence
-  continue_append = (CORBA::Boolean) (src->read_ulong (profiles)
-                                      ? dest->write_ulong (profiles)
-                                      : 0);
-
-  // No profiles means a NIL objref.
-  while (profiles-- != 0 && continue_append)
-    {
-      CORBA::ULong tag = 0;
-
-      // get the profile ID tag
-      if ((continue_append = (CORBA::Boolean) (src->read_ulong (tag)
-                                               ? dest->write_ulong (tag)
-                                               : 0))  == 0)
-        continue;
-
-      CORBA::ULong length = 0;
-      if ((continue_append = (CORBA::Boolean) (src->read_ulong (length)
-                              ? dest->write_ulong (length)
-                              : 0)) == 0)
-        continue;
-
-      // @@ This can be optimized! Pre-allocating on the destination
-      //    and then copying directly into that.
-      CORBA::Octet* body = 0;
-      ACE_NEW_RETURN (body,
-                      CORBA::Octet[length],
-                      TAO::TRAVERSE_STOP);
-      continue_append =
-        (CORBA::Boolean) (src->read_octet_array (body, length)
-                          ? dest->write_octet_array (body, length)
-                          : 0);
-      delete [] body;
-    }
-
-  if (continue_append == 1)
-    return TAO::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((
-        LM_DEBUG,
-        ACE_TEXT ("TAO_Marshal_ObjRef::append detected error\n")
-      ));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
-}
-
-TAO::traverse_status
-TAO_Marshal_Struct::append (CORBA::TypeCode_ptr  tc,
-                            TAO_InputCDR *src,
-                            TAO_OutputCDR *dest
-                            ACE_ENV_ARG_DECL)
-{
-  TAO::traverse_status retval =
-    TAO::TRAVERSE_CONTINUE;
-  CORBA::TypeCode_var param;
-
-  // Number of fields in the struct.
-  const CORBA::ULong member_count =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  for (CORBA::ULong i = 0;
-       i < member_count && retval == TAO::TRAVERSE_CONTINUE;
-       ++i)
-    {
-      // get member type
-      param = tc->member_type (i ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-      retval =
-        TAO_Marshal_Object::perform_append (param.in (),
-                                            src,
-                                            dest
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-    }
-
-  if (retval == TAO::TRAVERSE_CONTINUE)
-    return TAO::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO_Marshal_Struct::append detected error\n")));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
-}
-
-TAO::traverse_status
-TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc,
-                           TAO_InputCDR *src,
-                           TAO_OutputCDR *dest
-                           ACE_ENV_ARG_DECL)
-{
-  CORBA::TypeCode_var discrim_tc =
-    tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  CORBA::ULong kind =
-    discrim_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  // Save the discriminator value in a temporary variable...
-  CORBA::Short short_v;
-  CORBA::UShort ushort_v;
-  CORBA::Long long_v;
-  CORBA::ULong ulong_v;
-  CORBA::ULong enum_v;
-  CORBA::Char char_v;
-  CORBA::WChar wchar_v;
-  CORBA::Boolean boolean_v = false;
-
-  switch (kind)
-    {
-    case CORBA::tk_short:
-      {
-        if (!src->read_short (short_v)
-            || !dest->write_short (short_v))
-          return TAO::TRAVERSE_STOP;
-      }
-      break;
-
-    case CORBA::tk_ushort:
-      {
-        if (!src->read_ushort (ushort_v)
-            || !dest->write_ushort (ushort_v))
-          return TAO::TRAVERSE_STOP;
-      }
-      break;
-
-    case CORBA::tk_long:
-      {
-        if (!src->read_long (long_v)
-            || !dest->write_long (long_v))
-          return TAO::TRAVERSE_STOP;
-      }
-      break;
-
-    case CORBA::tk_ulong:
-      {
-        if (!src->read_ulong (ulong_v)
-            || !dest->write_ulong (ulong_v))
-          return TAO::TRAVERSE_STOP;
-      }
-      break;
-
-    case CORBA::tk_enum:
-      {
-        if (!src->read_ulong (enum_v)
-            || !dest->write_ulong (enum_v))
-          return TAO::TRAVERSE_STOP;
-      }
-      break;
-
-    case CORBA::tk_char:
-      {
-        if (!src->read_char (char_v)
-            || !dest->write_char (char_v))
-          return TAO::TRAVERSE_STOP;
-      }
-      break;
-
-    case CORBA::tk_wchar:
-      {
-        if (!src->read_wchar (wchar_v)
-            || !dest->write_wchar (wchar_v))
-          return TAO::TRAVERSE_STOP;
-      }
-      break;
-
-    case CORBA::tk_boolean:
-      {
-        if (!src->read_boolean (boolean_v)
-            || !dest->write_boolean (boolean_v))
-          return TAO::TRAVERSE_STOP;
-      }
-      break;
-
-    default:
-      return TAO::TRAVERSE_STOP;
-    }
-
-  const CORBA::ULong member_count =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  const CORBA::ULong null_member = ~static_cast<CORBA::ULong> (0U);
-
-  CORBA::ULong current_member = null_member;
-  CORBA::ULong default_member = null_member;
-
-  for (CORBA::ULong i = 0;
-       i < member_count && current_member == null_member;
-       ++i)
-    {
-      CORBA::Any_var any = tc->member_label (i
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-      CORBA::Octet o;
-
-      if ((any >>= CORBA::Any::to_octet (o)) && o == 0)
-        {
-          CORBA::ULong default_index =
-            tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-          if (i != default_index)
-            ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
-                              TAO::TRAVERSE_STOP);
-          // Found the default branch, save its position and continue
-          // trying to find the current value...
-          default_member = i;
-          continue;
-        }
-
-      switch (kind)
-        {
-        case CORBA::tk_short:
-          {
-            CORBA::Short d;
-            if ((any >>= d) && d == short_v)
-              current_member = i;
-          }
-          break;
-
-        case CORBA::tk_ushort:
-          {
-            CORBA::UShort d;
-            if ((any >>= d) && d == ushort_v)
-              current_member = i;
-          }
-          break;
-
-        case CORBA::tk_long:
-          {
-            CORBA::Long d;
-            if ((any >>= d) && d == long_v)
-              current_member = i;
-          }
-          break;
-
-        case CORBA::tk_ulong:
-          {
-            CORBA::ULong d;
-            if ((any >>= d) && d == ulong_v)
-              current_member = i;
-          }
-          break;
-
-        case CORBA::tk_enum:
-          {
-            CORBA::ULong d;
-            TAO::Any_Impl *impl = any->impl ();
-
-            if (impl->encoded ())
-              {
-                TAO::Unknown_IDL_Type *unk =
-                  dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-
-                // We don't want unk's rd_ptr to move, in case
-                // we are shared by another Any, so we use this
-                // to copy the state, not the buffer.
-                TAO_InputCDR for_reading (unk->_tao_get_cdr ());
-
-                for_reading.read_ulong (d);
-              }
-            else
-              {
-                TAO_OutputCDR out;
-                impl->marshal_value (out);
-                TAO_InputCDR cdr (out);
-                cdr.read_ulong (d);
-              }
-
-            if (d == enum_v)
-              {
-                current_member = i;
-              }
-          }
-          break;
-
-        case CORBA::tk_char:
-          {
-            CORBA::Char d;
-            if ((any >>= CORBA::Any::to_char (d)) && d == char_v)
-              current_member = i;
-          }
-          break;
-
-        case CORBA::tk_wchar:
-          {
-            CORBA::WChar d;
-            if ((any >>= CORBA::Any::to_wchar (d)) && d == wchar_v)
-              current_member = i;
-          }
-          break;
-
-        case CORBA::tk_boolean:
-          {
-            CORBA::Boolean d;
-            if ((any >>= CORBA::Any::to_boolean (d)) && d == boolean_v)
-              current_member = i;
-          }
-          break;
-
-        default:
-          return TAO::TRAVERSE_STOP;
-        }
-    }
-
-  if (current_member == null_member)
-    {
-      // Cannot find the current member, check if there is a
-      // default...
-      if (default_member != null_member)
-        {
-          // Good, use the default to append...
-          CORBA::TypeCode_var member_tc =
-            tc->member_type (default_member ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-          return TAO_Marshal_Object::perform_append (member_tc.in (),
-                                                     src,
-                                                     dest
-                                                     ACE_ENV_ARG_PARAMETER);
-        }
-
-      // If we're here, we have an implicit default case, and we
-      // should just return without appending anything, since no
-      // union member was marshaled in the first place.
-      return TAO::TRAVERSE_CONTINUE;
-    }
-
-  // If we found the member successfully then just use that one...
-  CORBA::TypeCode_var member_tc =
-    tc->member_type (current_member ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-  return TAO_Marshal_Object::perform_append (member_tc.in (),
-                                             src,
-                                             dest
-                                             ACE_ENV_ARG_PARAMETER);
-}
-
-TAO::traverse_status
-TAO_Marshal_String::append (CORBA::TypeCode_ptr,
-                            TAO_InputCDR *src,
-                            TAO_OutputCDR *dest
-                            ACE_ENV_ARG_DECL)
-{
-  CORBA::Boolean continue_append = 1;
-
-  // On decode, omit the check against specified string bounds, and
-  // cope with illegal "zero length" strings (all lengths on the wire
-  // must include a NUL).
-  //
-  // This is on the principle of being gracious in what we accept; we
-  // don't generate messages that fail to comply with protocol specs,
-  // but we will accept them when it's clear how to do so.
-
-  continue_append = dest->append_string (*src);
-  if (continue_append == 1)
-    return TAO::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO_Marshal_TypeCode::append detected error\n")));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
-}
-
-TAO::traverse_status
-TAO_Marshal_Sequence::append (CORBA::TypeCode_ptr  tc,
-                              TAO_InputCDR *src,
-                              TAO_OutputCDR *dest
-                              ACE_ENV_ARG_DECL)
-{
-  // Size of element.
-  CORBA::ULong bounds;
-
-  // First unmarshal the sequence length ... we trust it to be right
-  // here, on the "be gracious in what you accept" principle.  We
-  // don't generate illegal sequences (i.e. length > bounds).
-
-  CORBA::Boolean continue_append =
-    (CORBA::Boolean) (src->read_ulong (bounds)
-                      ? dest->write_ulong (bounds)
-                      : 0);
-
-  if (!continue_append)
-    {
-      ACE_DEBUG ((
-          LM_DEBUG,
-          ACE_TEXT ("TAO_Marshal_Sequence::append detected error\n")
-        ));
-      ACE_THROW_RETURN (CORBA::MARSHAL (),
-                        TAO::TRAVERSE_STOP);
-    }
-
-  if (bounds == 0)
-    {
-      return TAO::TRAVERSE_CONTINUE;
-    }
-
-  if (continue_append)
-    {
-      // Get element typecode.
-      CORBA::TypeCode_var tc2 =
-        tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-      TAO::traverse_status retval =
-        TAO::TRAVERSE_CONTINUE;
-
-      CORBA::TCKind kind = tc2->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-      switch (kind)
-        {
-        case CORBA::tk_octet:
-          {
-            char* buf;
-            if (dest->adjust (ACE_CDR::OCTET_SIZE * bounds,
-                              ACE_CDR::OCTET_ALIGN, buf) == 0)
-              {
-                if (src->read_octet_array ((ACE_CDR::Octet*)buf, bounds) == 0)
-                  retval = TAO::TRAVERSE_STOP;
-              }
-          }
-          break;
-        case CORBA::tk_boolean:
-          {
-            char* buf;
-            if (dest->adjust (ACE_CDR::OCTET_SIZE * bounds,
-                              ACE_CDR::OCTET_ALIGN, buf) == 0)
-              {
-                if (src->read_boolean_array ((ACE_CDR::Boolean*)buf, bounds) == 0)
-                  retval = TAO::TRAVERSE_STOP;
-              }
-          }
-          break;
-        case CORBA::tk_char:
-          {
-            char* buf;
-            if (dest->adjust (ACE_CDR::OCTET_SIZE * bounds,
-                              ACE_CDR::OCTET_ALIGN, buf) == 0)
-              {
-                if (src->read_char_array ((ACE_CDR::Char*)buf, bounds) == 0)
-                  retval = TAO::TRAVERSE_STOP;
-              }
-          }
-          break;
-        case CORBA::tk_short:
-          {
-            char* buf;
-            if (dest->adjust (ACE_CDR::SHORT_SIZE * bounds,
-                              ACE_CDR::SHORT_ALIGN, buf) == 0)
-              {
-                if (src->read_short_array ((ACE_CDR::Short*)buf, bounds) == 0)
-                  retval = TAO::TRAVERSE_STOP;
-              }
-          }
-          break;
-        case CORBA::tk_ushort:
-          {
-            char* buf;
-            if (dest->adjust (ACE_CDR::SHORT_SIZE * bounds,
-                              ACE_CDR::SHORT_ALIGN, buf) == 0)
-              {
-                if (src->read_ushort_array ((ACE_CDR::UShort*)buf, bounds) == 0)
-                  retval = TAO::TRAVERSE_STOP;
-              }
-          }
-          break;
-        case CORBA::tk_wchar:
-          {
-            char* buf;
-            if (dest->adjust (ACE_CDR::SHORT_SIZE * bounds,
-                              ACE_CDR::SHORT_ALIGN, buf) == 0)
-              {
-                if (src->read_wchar_array ((ACE_CDR::WChar*)buf, bounds) == 0)
-                  retval = TAO::TRAVERSE_STOP;
-              }
-          }
-          break;
-        case CORBA::tk_long:
-          {
-            char* buf;
-            if (dest->adjust (ACE_CDR::LONG_SIZE * bounds,
-                              ACE_CDR::LONG_ALIGN, buf) == 0)
-              {
-                if (src->read_long_array ((ACE_CDR::Long*)buf, bounds) == 0)
-                  retval = TAO::TRAVERSE_STOP;
-              }
-          }
-          break;
-        case CORBA::tk_ulong:
-          {
-            char* buf;
-            if (dest->adjust (ACE_CDR::LONG_SIZE * bounds,
-                              ACE_CDR::LONG_ALIGN, buf) == 0)
-              {
-                if (src->read_ulong_array ((ACE_CDR::ULong*)buf, bounds) == 0)
-                  retval = TAO::TRAVERSE_STOP;
-              }
-          }
-          break;
-        case CORBA::tk_float:
-          {
-            char* buf;
-            if (dest->adjust (ACE_CDR::LONG_SIZE * bounds,
-                              ACE_CDR::LONG_ALIGN, buf) == 0)
-              {
-                if (src->read_float_array ((ACE_CDR::Float*)buf, bounds) == 0)
-                  retval = TAO::TRAVERSE_STOP;
-              }
-          }
-          break;
-        case CORBA::tk_double:
-          {
-            char* buf;
-            if (dest->adjust (ACE_CDR::LONGLONG_SIZE * bounds,
-                              ACE_CDR::LONGLONG_ALIGN, buf) == 0)
-              {
-                if (src->read_double_array ((ACE_CDR::Double*)buf, bounds) == 0)
-                  retval = TAO::TRAVERSE_STOP;
-              }
-          }
-          break;
-        case CORBA::tk_longlong:
-          {
-            char* buf;
-            if (dest->adjust (ACE_CDR::LONGLONG_SIZE * bounds,
-                              ACE_CDR::LONGLONG_ALIGN, buf) == 0)
-              {
-                if (src->read_longlong_array ((ACE_CDR::LongLong*)buf, bounds) == 0)
-                  retval = TAO::TRAVERSE_STOP;
-              }
-          }
-          break;
-        case CORBA::tk_ulonglong:
-          {
-            char* buf;
-            if (dest->adjust (ACE_CDR::LONGLONG_SIZE * bounds,
-                              ACE_CDR::LONGLONG_ALIGN, buf) == 0)
-              {
-                if (src->read_ulonglong_array ((ACE_CDR::ULongLong*)buf, bounds) == 0)
-                  retval = TAO::TRAVERSE_STOP;
-              }
-          }
-          break;
-        case CORBA::tk_longdouble:
-          {
-            char* buf;
-            if (dest->adjust (ACE_CDR::LONGDOUBLE_SIZE * bounds,
-                              ACE_CDR::LONGDOUBLE_ALIGN, buf) == 0)
-              {
-                if (src->read_longdouble_array ((ACE_CDR::LongDouble*)buf, bounds) == 0)
-                  retval = TAO::TRAVERSE_STOP;
-              }
-          }
-          break;
-
-        default:
-          while (bounds-- && retval == TAO::TRAVERSE_CONTINUE)
-            {
-              retval = TAO_Marshal_Object::perform_append (tc2.in (),
-                                                           src,
-                                                           dest
-                                                            ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-            }
-          break;
-        }// end of switch
-
-      if (retval == TAO::TRAVERSE_CONTINUE)
-        return TAO::TRAVERSE_CONTINUE;
-    }
-  // error exit
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((
-        LM_DEBUG,
-        ACE_TEXT ("marshaling TAO_Marshal_Sequence::append detected error\n")
-      ));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (),
-                    TAO::TRAVERSE_STOP);
-}
-
-TAO::traverse_status
-TAO_Marshal_Array::append (CORBA::TypeCode_ptr  tc,
-                           TAO_InputCDR *src,
-                           TAO_OutputCDR *dest
-                           ACE_ENV_ARG_DECL)
-{
-  // retrieve the bounds of the array
-  CORBA::ULong bounds = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  // get element typecode
-  CORBA::TypeCode_var tc2 = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  // For CORBA basic types, the copy can be optimized
-  CORBA::TCKind kind = tc2->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  // Return status.
-  TAO::traverse_status retval =
-    TAO::TRAVERSE_CONTINUE;
-
-  switch (kind)
-    {
-    case CORBA::tk_octet:
-      {
-        char* buf;
-        if (dest->adjust (ACE_CDR::OCTET_SIZE * bounds,
-                          ACE_CDR::OCTET_ALIGN, buf) == 0)
-          {
-            if (src->read_octet_array ((ACE_CDR::Octet*)buf, bounds) == 0)
-              retval = TAO::TRAVERSE_STOP;
-          }
-      }
-      break;
-    case CORBA::tk_boolean:
-      {
-        char* buf;
-        if (dest->adjust (ACE_CDR::OCTET_SIZE * bounds,
-                          ACE_CDR::OCTET_ALIGN, buf) == 0)
-          {
-            if (src->read_boolean_array ((ACE_CDR::Boolean*)buf, bounds) == 0)
-              retval = TAO::TRAVERSE_STOP;
-          }
-      }
-      break;
-    case CORBA::tk_char:
-      {
-        char* buf;
-        if (dest->adjust (ACE_CDR::OCTET_SIZE * bounds,
-                          ACE_CDR::OCTET_ALIGN, buf) == 0)
-          {
-            if (src->read_char_array ((ACE_CDR::Char*)buf, bounds) == 0)
-              retval = TAO::TRAVERSE_STOP;
-          }
-      }
-      break;
-    case CORBA::tk_short:
-      {
-        char* buf;
-        if (dest->adjust (ACE_CDR::SHORT_SIZE * bounds,
-                          ACE_CDR::SHORT_ALIGN, buf) == 0)
-          {
-            if (src->read_short_array ((ACE_CDR::Short*)buf, bounds) == 0)
-              retval = TAO::TRAVERSE_STOP;
-          }
-      }
-      break;
-    case CORBA::tk_ushort:
-      {
-        char* buf;
-        if (dest->adjust (ACE_CDR::SHORT_SIZE * bounds,
-                          ACE_CDR::SHORT_ALIGN, buf) == 0)
-          {
-            if (src->read_ushort_array ((ACE_CDR::UShort*)buf, bounds) == 0)
-              retval = TAO::TRAVERSE_STOP;
-          }
-      }
-      break;
-    case CORBA::tk_wchar:
-      {
-        char* buf;
-        if (dest->adjust (ACE_CDR::SHORT_SIZE * bounds,
-                          ACE_CDR::SHORT_ALIGN, buf) == 0)
-          {
-            if (src->read_wchar_array ((ACE_CDR::WChar*)buf, bounds) == 0)
-              retval = TAO::TRAVERSE_STOP;
-          }
-      }
-      break;
-    case CORBA::tk_long:
-      {
-        char* buf;
-        if (dest->adjust (ACE_CDR::LONG_SIZE * bounds,
-                          ACE_CDR::LONG_ALIGN, buf) == 0)
-          {
-            if (src->read_long_array ((ACE_CDR::Long*)buf, bounds) == 0)
-              retval = TAO::TRAVERSE_STOP;
-          }
-      }
-      break;
-    case CORBA::tk_ulong:
-      {
-        char* buf;
-        if (dest->adjust (ACE_CDR::LONG_SIZE * bounds,
-                          ACE_CDR::LONG_ALIGN, buf) == 0)
-          {
-            if (src->read_ulong_array ((ACE_CDR::ULong*)buf, bounds) == 0)
-              retval = TAO::TRAVERSE_STOP;
-          }
-      }
-      break;
-    case CORBA::tk_float:
-      {
-        char* buf;
-        if (dest->adjust (ACE_CDR::LONG_SIZE * bounds,
-                          ACE_CDR::LONG_ALIGN, buf) == 0)
-          {
-            if (src->read_float_array ((ACE_CDR::Float*)buf, bounds) == 0)
-              retval = TAO::TRAVERSE_STOP;
-          }
-      }
-      break;
-    case CORBA::tk_double:
-      {
-        char* buf;
-        if (dest->adjust (ACE_CDR::LONGLONG_SIZE * bounds,
-                          ACE_CDR::LONGLONG_ALIGN, buf) == 0)
-          {
-            if (src->read_double_array ((ACE_CDR::Double*)buf, bounds) == 0)
-              retval = TAO::TRAVERSE_STOP;
-          }
-      }
-      break;
-    case CORBA::tk_longlong:
-      {
-        char* buf;
-        if (dest->adjust (ACE_CDR::LONGLONG_SIZE * bounds,
-                          ACE_CDR::LONGLONG_ALIGN, buf) == 0)
-          {
-            if (src->read_longlong_array ((ACE_CDR::LongLong*)buf, bounds) == 0)
-              retval = TAO::TRAVERSE_STOP;
-          }
-      }
-      break;
-    case CORBA::tk_ulonglong:
-      {
-        char* buf;
-        if (dest->adjust (ACE_CDR::LONGLONG_SIZE * bounds,
-                          ACE_CDR::LONGLONG_ALIGN, buf) == 0)
-          {
-            if (src->read_ulonglong_array ((ACE_CDR::ULongLong*)buf, bounds) == 0)
-              retval = TAO::TRAVERSE_STOP;
-          }
-      }
-      break;
-    case CORBA::tk_longdouble:
-      {
-        char* buf;
-        if (dest->adjust (ACE_CDR::LONGDOUBLE_SIZE * bounds,
-                          ACE_CDR::LONGDOUBLE_ALIGN, buf) == 0)
-          {
-            if (src->read_longdouble_array ((ACE_CDR::LongDouble*)buf, bounds) == 0)
-              retval = TAO::TRAVERSE_STOP;
-          }
-      }
-      break;
-    default:
-      while (bounds-- && retval == TAO::TRAVERSE_CONTINUE)
-        {
-          retval = TAO_Marshal_Object::perform_append (tc2.in (),
-                                                       src,
-                                                       dest
-                                                       ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-        }
-      break;
-    }// end of switch
-
-  if (retval == TAO::TRAVERSE_CONTINUE)
-    return retval;
-
-  // error exit
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO_Marshal_Sequence::append detected error\n")));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (),
-                    TAO::TRAVERSE_STOP);
-}
-
-TAO::traverse_status
-TAO_Marshal_Alias::append (CORBA::TypeCode_ptr  tc,
-                           TAO_InputCDR *src,
-                           TAO_OutputCDR *dest
-                           ACE_ENV_ARG_DECL)
-{
-  // Typecode of the aliased type.
-  CORBA::TypeCode_var tc2;
-  CORBA::Boolean continue_append = 1;
-
-  // Status of decode operation.
-  TAO::traverse_status retval =
-    TAO::TRAVERSE_CONTINUE;
-
-  tc2 = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  retval = TAO_Marshal_Object::perform_append (tc2.in (),
-                                               src,
-                                               dest
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  if (retval == TAO::TRAVERSE_CONTINUE
-      && continue_append == 1)
-    return TAO::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO_Marshal_Alias::append detected error\n")));
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
-}
-
-// Decode exception For exceptions, the "hidden" type ID near the
-// front of the on-wire representation was previously unmarshaled and
-// mapped to the "tc" typcode we're using to traverse the memory ...
-// at the same time its vtable, refcount, and other state was
-// established.
-//
-// NOTE: This is asymmetric with respect to encoding exceptions.
-TAO::traverse_status
-TAO_Marshal_Except::append (CORBA::TypeCode_ptr  tc,
-                            TAO_InputCDR *src,
-                            TAO_OutputCDR *dest
-                            ACE_ENV_ARG_DECL)
-{
-  TAO::traverse_status retval =
-    TAO::TRAVERSE_CONTINUE;
-  CORBA::Boolean continue_append = 1;
-  CORBA::TypeCode_var param;
-
-  // first append the RepositoryID
-  continue_append = dest->append_string (*src);
-
-  // Number of fields in the struct.
-  const CORBA::ULong member_count =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  for (CORBA::ULong i = 0;
-       i < member_count
-         && retval == TAO::TRAVERSE_CONTINUE
-         && continue_append == 1;
-       ++i)
-    {
-      param = tc->member_type (i ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-      retval = TAO_Marshal_Object::perform_append (param.in (),
-                                                   src,
-                                                   dest
-                                                   ACE_ENV_ARG_PARAMETER);
-    }
-
-  if (retval == TAO::TRAVERSE_CONTINUE
-      && continue_append == 1)
-    return TAO::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO_Marshal_Except::append detected error\n")));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
-}
-
-TAO::traverse_status
-TAO_Marshal_WString::append (CORBA::TypeCode_ptr,
-                             TAO_InputCDR *src,
-                             TAO_OutputCDR *dest
-                             ACE_ENV_ARG_DECL)
-{
-  CORBA::Boolean continue_append = 1;
-
-  // On decode, omit the check against specified wstring bounds, and
-  // cope with illegal "zero length" strings (all lengths on the wire
-  // must include a NUL).
-  //
-  // This is on the principle of being gracious in what we accept; we
-  // don't generate messages that fail to comply with protocol specs,
-  // but we will accept them when it's clear how to do so.
-
-  continue_append = dest->append_wstring (*src);
-
-  if (continue_append == 1)
-    return TAO::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO_Marshal_WString::append detected error\n")));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
-}
-
-TAO::traverse_status
-TAO_Marshal_Value::append (CORBA::TypeCode_ptr  tc,
-                           TAO_InputCDR *src,
-                           TAO_OutputCDR *dest
-                           ACE_ENV_ARG_DECL)
-{
-  TAO::traverse_status retval =
-    TAO::TRAVERSE_CONTINUE;
-
-  // Use the same method to append our base valuetype.
-  // To achive this we'll need to distinguish between
-  // first-time/nested appends so that we won't attempt to
-  // append rep_id several times.
-  //
-  if (this->nested_processing_ == 0)
-    {
-      this->nested_processing_ = 1;
-
-      CORBA::ULong value_tag;
-
-      if (!src->read_ulong (value_tag) ||
-          !dest->write_ulong (value_tag))
-        {
-          return TAO::TRAVERSE_STOP;
-        }
-
-      TAO_Valuetype_Adapter *adapter =
-        ACE_Dynamic_Service<TAO_Valuetype_Adapter>::instance (
-            TAO_ORB_Core::valuetype_adapter_name ()
-          );
-
-      if (adapter == 0)
-        {
-          ACE_THROW_RETURN (CORBA::INTERNAL (),
-                            TAO::TRAVERSE_STOP);
-        }
-
-      if (value_tag == 0) // Null value type pointer.
-        {
-          //We are done.
-          return retval;
-        }
-      else if (value_tag & adapter->type_info_single ())
-        {
-          // Append repository id which is of type string.
-          dest->append_string (*src);
-        }
-      else
-        {
-          //@@ boris: VT CDR
-          return TAO::TRAVERSE_STOP;
-        }
-    }
-
-  // Handle our base valuetype if any.
-  CORBA::TypeCode_var param =
-    tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  CORBA::TCKind const param_kind = param->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  if (param_kind != CORBA::tk_null)
-    {
-      retval = this->append (param.in (),
-                             src,
-                             dest
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-      if (retval != TAO::TRAVERSE_CONTINUE)
-        {
-          return retval;
-        }
-    }
-
-  // Number of fields in the struct.
-  const CORBA::ULong member_count =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  for (CORBA::ULong i = 0;
-       i < member_count && retval == TAO::TRAVERSE_CONTINUE;
-       ++i)
-    {
-      // get member type
-      param = tc->member_type (i ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-      retval =
-        TAO_Marshal_Object::perform_append (param.in (),
-                                            src,
-                                            dest
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-    }
-
-  if (retval == TAO::TRAVERSE_CONTINUE)
-    return TAO::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO_Marshal_Value::append detected error\n")));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
-}
diff --git a/TAO/tao/corba.h b/TAO/tao/corba.h
index b94dc564704..737bd8d5930 100644
--- a/TAO/tao/corba.h
+++ b/TAO/tao/corba.h
@@ -34,21 +34,18 @@
 
 // The definitions are included in the same order as they are declared
 // in corbafwd.h
-#include "tao/TypeCode.h"
+#include "tao/AnyTypeCode/TypeCode.h"
 
 #include "tao/Environment.h"
 #include "tao/SystemException.h"
 #include "tao/UserException.h"
 
-#include "tao/NVList.h"
-
 #include "tao/Object.h"
 #include "tao/LocalObject.h"
 #include "tao/Principal.h"
 #include "tao/ORB.h"
 
 #include "tao/CurrentC.h"
-#include "tao/BoundsC.h"
 #include "tao/PolicyC.h"
 #include "tao/ServicesC.h"
 #include "tao/DomainC.h"
@@ -56,7 +53,6 @@
 
 #include "tao/ObjectIdListC.h"
 
-#include "tao/AnySeqC.h"
 #include "tao/BooleanSeqC.h"
 #include "tao/CharSeqC.h"
 #include "tao/DoubleSeqC.h"
diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h
index a15ee8c758b..80a9dc3b318 100644
--- a/TAO/tao/corbafwd.h
+++ b/TAO/tao/corbafwd.h
@@ -31,7 +31,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/TC_Constants_Forward.h"
 #include "tao/CORBA_methods.h"
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/extra_core.mpb b/TAO/tao/extra_core.mpb
index 3d16ae00da6..8d7542b0509 100644
--- a/TAO/tao/extra_core.mpb
+++ b/TAO/tao/extra_core.mpb
@@ -3,7 +3,6 @@
 
 feature(!minimum_corba) {
   Source_Files(TAO_COMPONENTS) {
-    NVList.cpp
     ClientRequestInterceptor_Adapter.cpp
     ServerRequestInterceptor_Adapter.cpp
     ServicesC.cpp
diff --git a/TAO/tao/operation_details.cpp b/TAO/tao/operation_details.cpp
index 807f8e480b7..c75ced2a83f 100644
--- a/TAO/tao/operation_details.cpp
+++ b/TAO/tao/operation_details.cpp
@@ -1,25 +1,22 @@
 //$Id$
+
 #include "operation_details.h"
 #include "Stub.h"
-#include "TypeCode.h"
 #include "ORB_Constants.h"
-#include "DynamicC.h"
 #include "Exception_Data.h"
 #include "SystemException.h"
+#include "Argument.h"
 
 #include "ace/OS_NS_string.h"
 
-
 #if !defined (__ACE_INLINE__)
 # include "tao/operation_details.i"
 #endif /* ! __ACE_INLINE__ */
 
-
 ACE_RCSID (tao,
            operation_details,
            "$Id$")
 
-
 CORBA::Exception *
 TAO_Operation_Details::corba_exception (const char *id
                                         ACE_ENV_ARG_DECL)
@@ -78,54 +75,3 @@ TAO_Operation_Details::demarshal_args (TAO_InputCDR &cdr)
   return true;
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
-bool
-TAO_Operation_Details::parameter_list (Dynamic::ParameterList &param_list)
-{
-  // Account for the return type that could be in the argument list.
-  param_list.length (this->num_args_ - 1);
-
-   for (CORBA::ULong i = 1; i != this->num_args_; ++i)
-     this->args_[i]->interceptor_param (param_list[i - 1]);
-
-   return true;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-bool
-TAO_Operation_Details::exception_list (Dynamic::ExceptionList &exception_list)
-{
-  if (this->ex_count_)
-    {
-      exception_list.length (this->ex_count_);
-
-      for (CORBA::ULong i = 0;
-           i != this->ex_count_;
-           ++i)
-        {
-          CORBA::TypeCode_ptr tcp = this->ex_data_[i].tc_ptr;
-          TAO_Pseudo_Object_Manager<CORBA::TypeCode> tcp_object (&tcp, 1);
-          exception_list[i] = tcp_object;
-        }
-    }
-  return true;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-bool
-TAO_Operation_Details::result (CORBA::Any *any)
-{
-  for (CORBA::ULong i = 0; i != this->num_args_; ++i)
-    (*this->args_[i]).interceptor_result (any);
-
-  return true;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tao/operation_details.h b/TAO/tao/operation_details.h
index 04d137e39e9..0b1fee4c2a3 100644
--- a/TAO/tao/operation_details.h
+++ b/TAO/tao/operation_details.h
@@ -76,7 +76,6 @@ public:
   void response_flags (CORBA::Octet flags);
 
   /// Get the response flags
-  CORBA::Octet response_flags (void);
   CORBA::Octet response_flags (void) const;
 
   /// Accessors for the service context list
@@ -103,7 +102,6 @@ public:
   CORBA::ULong request_id (void) const;
 
   /// Accessor method for the addressing mode
-  TAO_Target_Specification::TAO_Target_Address addressing_mode (void);
   TAO_Target_Specification::TAO_Target_Address addressing_mode (void) const;
 
   /// Set method for the addressing mode
@@ -133,22 +131,15 @@ public:
   /// Demarshals the list of <this->arg_> into the \a cdr.
   bool demarshal_args (TAO_InputCDR &cdr);
 
-  /**
-   * The following methods are used by client interceptors to extract
-   * the list of parameters passed by the operation, exceptions
-   * declared for the operation, and the result when available.
-   */
-#if TAO_HAS_INTERCEPTORS == 1
-  bool exception_list (Dynamic::ExceptionList &exception_list);
-  bool parameter_list (Dynamic::ParameterList &param_list);
-  bool result (CORBA::Any *any);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-  //@}
-
   /// Accessors for the argument list
   TAO::Argument ** args (void) const;
   CORBA::ULong args_num (void) const ;
 
+  /// Exception count
+  CORBA::ULong ex_count (void) const;
+
+  TAO::Exception_Data const * ex_data (void) const;
+
 private:
 
   /// Name of the operation being invoked.
diff --git a/TAO/tao/operation_details.i b/TAO/tao/operation_details.i
index f1178f5bc87..666bb7cad51 100644
--- a/TAO/tao/operation_details.i
+++ b/TAO/tao/operation_details.i
@@ -118,22 +118,22 @@ TAO_Operation_Details::response_flags (CORBA::Octet flags)
   this->response_flags_ = flags;
 }
 
-ACE_INLINE CORBA::Octet
-TAO_Operation_Details::response_flags (void)
+ACE_INLINE CORBA::ULong
+TAO_Operation_Details::ex_count (void) const
 {
-  return this->response_flags_;
+  return this->ex_count_;
 }
 
-ACE_INLINE CORBA::Octet
-TAO_Operation_Details::response_flags (void) const
+ACE_INLINE TAO::Exception_Data const *
+TAO_Operation_Details::ex_data (void) const
 {
-  return this->response_flags_;
+  return this->ex_data_;
 }
 
-ACE_INLINE TAO_Target_Specification::TAO_Target_Address
-TAO_Operation_Details::addressing_mode (void)
+ACE_INLINE CORBA::Octet
+TAO_Operation_Details::response_flags (void) const
 {
-  return this->addressing_mode_;
+  return this->response_flags_;
 }
 
 ACE_INLINE TAO_Target_Specification::TAO_Target_Address
diff --git a/TAO/tao/orb.idl b/TAO/tao/orb.idl
index 4d0e7a8fe94..265865f4d2f 100644
--- a/TAO/tao/orb.idl
+++ b/TAO/tao/orb.idl
@@ -8,7 +8,6 @@
 #define TAO_ORB_IDL
 
 ///FUZZ: disable check_for_include/
-#include <tao/AnySeq.pidl>
 #include <tao/BooleanSeq.pidl>
 #include <tao/CharSeq.pidl>
 #include <tao/DoubleSeq.pidl>
@@ -36,8 +35,6 @@
 #include <tao/ParameterMode.pidl>
 #include <tao/orb_types.pidl>
 #include <tao/Typecode_types.pidl>
-#include <tao/Visibility.pidl>
-#include <tao/ValueModifier.pidl>
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/orb_typesC.cpp b/TAO/tao/orb_typesC.cpp
index f8e4bbfb1c5..168eeabc2fb 100644
--- a/TAO/tao/orb_typesC.cpp
+++ b/TAO/tao/orb_typesC.cpp
@@ -26,19 +26,11 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:288
 
 
 #include "orb_typesC.h"
 #include "tao/CDR.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
@@ -48,83 +40,3 @@ namespace TAO
 {
 }
 
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ORBid (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ORBid:1.0",
-    "ORBid",
-    &CORBA::_tc_string);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ORBid =
-    &_tao_tc_CORBA_ORBid;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_Flags (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/Flags:1.0",
-    "Flags",
-    &CORBA::_tc_ulong);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_Flags =
-    &_tao_tc_CORBA_Flags;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_Identifier (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/Identifier:1.0",
-    "Identifier",
-    &CORBA::_tc_string);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_Identifier =
-    &_tao_tc_CORBA_Identifier;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_RepositoryId (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/RepositoryId:1.0",
-    "RepositoryId",
-    &CORBA::_tc_string);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_RepositoryId =
-    &_tao_tc_CORBA_RepositoryId;
-}
-
-
diff --git a/TAO/tao/orb_typesC.h b/TAO/tao/orb_typesC.h
index d598d6e8fc4..17a295fddf6 100644
--- a/TAO/tao/orb_typesC.h
+++ b/TAO/tao/orb_typesC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_ORB_TYPESC_H_
-#define _TAO_IDL_ORIG_ORB_TYPESC_H_
+#ifndef _TAO_IDL_ORB_TYPESC_H_
+#define _TAO_IDL_ORB_TYPESC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -54,12 +54,8 @@
 #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
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace CORBA
 {
@@ -72,22 +68,12 @@ namespace CORBA
   typedef CORBA::String_out ORBid_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ORBid;
-  
-  // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:379
   
   typedef CORBA::ULong Flags;
   typedef CORBA::ULong_out Flags_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_Flags;
-  
-  // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:413
   
   typedef char * Identifier;
@@ -95,24 +81,14 @@ namespace CORBA
   typedef CORBA::String_out Identifier_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_Identifier;
-  
-  // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:413
   
   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
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_RepositoryId;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module CORBA
 
@@ -125,16 +101,12 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
+// be\be_codegen.cpp:1062
 
 #if defined(_MSC_VER)
 #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/params.h b/TAO/tao/params.h
index e45026c8e65..a44134f38c6 100644
--- a/TAO/tao/params.h
+++ b/TAO/tao/params.h
@@ -196,16 +196,13 @@ private:
   int parse_and_add_endpoints (const ACE_CString &endpoints,
                                TAO_EndpointSet &endpoint_set);
 
-  /// List of endpoints used to pre-establish connections.
-  // TAO_EndpointSet preconnects_list_;
-
   /// Map of endpoints this server is willing to accept requests on.
   endpoints_map_type endpoints_map_;
 
   /// Port numbers of the configured services.
   CORBA::UShort service_port_[TAO_NO_OF_MCAST_SERVICES];
 
-  /// address:port for Multicast Discovery Protocol for the Naming
+  /// Address:port for Multicast Discovery Protocol for the Naming
   /// Service.
   CORBA::String_var mcast_discovery_endpoint_;
 
diff --git a/TAO/tao/skip.cpp b/TAO/tao/skip.cpp
deleted file mode 100644
index 828891c1973..00000000000
--- a/TAO/tao/skip.cpp
+++ /dev/null
@@ -1,1040 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-//
-// = FILENAME
-//     skip.cpp
-//
-// = DESCRIPTION
-//     Code for skipping different data types
-//
-//     Data types encoded as CDR streams need to be skipped when they
-//     are part of an Any.
-//
-// = AUTHOR
-//     Aniruddha Gokhale
-//
-// ============================================================================
-
-#include "Marshal.h"
-#include "debug.h"
-#include "Valuetype_Adapter.h"
-#include "ORB_Core.h"
-#include "TypeCode.h"
-#include "Any_Unknown_IDL_Type.h"
-#include "tao/CDR.h"
-#include "SystemException.h"
-
-#include "ace/Dynamic_Service.h"
-
-ACE_RCSID (tao,
-           skip,
-           "$Id$")
-
-TAO::traverse_status
-TAO_Marshal_Primitive::skip (CORBA::TypeCode_ptr  tc,
-                             TAO_InputCDR *stream
-                             ACE_ENV_ARG_DECL)
-{
-  CORBA::Boolean continue_skipping = 1;
-
-  // Status of skip operation.
-  TAO::traverse_status retval = TAO::TRAVERSE_CONTINUE;
-
-  CORBA::TCKind const k = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  switch (k)
-    {
-    case CORBA::tk_null:
-    case CORBA::tk_void:
-      break;
-    case CORBA::tk_short:
-    case CORBA::tk_ushort:
-      continue_skipping = stream->skip_short ();
-      break;
-    case CORBA::tk_long:
-    case CORBA::tk_ulong:
-    case CORBA::tk_float:
-    case CORBA::tk_enum:
-      continue_skipping = stream->skip_long ();
-      break;
-    case CORBA::tk_double:
-    case CORBA::tk_longlong:
-    case CORBA::tk_ulonglong:
-      continue_skipping = stream->skip_longlong ();
-      break;
-    case CORBA::tk_boolean:
-      continue_skipping = stream->skip_boolean ();
-      break;
-    case CORBA::tk_char:
-    case CORBA::tk_octet:
-      continue_skipping = stream->skip_char ();
-      break;
-    case CORBA::tk_longdouble:
-      continue_skipping = stream->skip_longdouble ();
-      break;
-    case CORBA::tk_wchar:
-      continue_skipping = stream->skip_wchar ();
-      break;
-    default:
-      retval = TAO::TRAVERSE_STOP;
-      // we are not a primitive type
-    }
-  if (retval == TAO::TRAVERSE_CONTINUE
-      && continue_skipping == 1)
-    return TAO::TRAVERSE_CONTINUE;
-  else
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((
-            LM_DEBUG,
-            ACE_TEXT ("TAO_Marshal_Primitive::skip detected error\n")
-          ));
-      ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                        CORBA::COMPLETED_MAYBE),
-                        TAO::TRAVERSE_STOP);
-    }
-}
-
-TAO::traverse_status
-TAO_Marshal_Any::skip (CORBA::TypeCode_ptr,
-                       TAO_InputCDR *stream
-                       ACE_ENV_ARG_DECL)
-{
-  // Typecode of the element that makes the Any.
-  CORBA::TypeCode_var elem_tc;
-
-  // Status of encode operation.
-  if (!(*stream >> elem_tc.inout ()))
-    return TAO::TRAVERSE_STOP;
-
-  return TAO_Marshal_Object::perform_skip (elem_tc.in (),
-                                           stream
-                                           ACE_ENV_ARG_PARAMETER);
-}
-
-TAO::traverse_status
-TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr,
-                            TAO_InputCDR *stream
-                            ACE_ENV_ARG_DECL)
-{
-  CORBA::Boolean continue_skipping = 1;
-
-  // Typecode kind.
-  CORBA::ULong kind;
-
-  // Decode the "kind" field of the typecode from the stream.
-  continue_skipping = stream->read_ulong (kind);
-
-  if (continue_skipping == 1)
-    {
-      // Typecodes with empty parameter lists all have preallocated
-      // constants.  We use those to reduce memory consumption and
-      // heap access ... also, to speed things up!
-      if ((kind < CORBA::TAO_TC_KIND_COUNT) ||
-          (kind == ~0u))
-        {
-          // Either a non-constant typecode or an indirected typecode.
-          switch (kind)
-            {
-              // Need special handling for all kinds of typecodes that
-              // have nonempty parameter lists ...
-            default:
-              // simple typecodes, nothing to do
-              break;
-            case CORBA::tk_string:
-            case CORBA::tk_wstring:
-              {
-                // skip the bounds
-                continue_skipping = stream->skip_ulong ();
-              }
-            break;
-
-            // Indirected typecodes, illegal at "top level".
-            case ~0u:
-              {
-                // skip the long indicating the encapsulation offset,
-                continue_skipping = stream->skip_long ();
-              }
-            break;
-
-            // The rest have "complex" parameter lists that are
-            // encoded as bulk octets ...
-            case CORBA::tk_objref:
-            case CORBA::tk_struct:
-            case CORBA::tk_union:
-            case CORBA::tk_enum:
-            case CORBA::tk_sequence:
-            case CORBA::tk_array:
-            case CORBA::tk_alias:
-            case CORBA::tk_except:
-            case CORBA::tk_value:
-            case CORBA::tk_value_box:
-            case CORBA::tk_native:
-            case CORBA::tk_abstract_interface:
-            case CORBA::tk_local_interface:
-            case CORBA::tk_component:
-            case CORBA::tk_home:
-            case CORBA::tk_event:
-              {
-                CORBA::ULong length;
-
-                // get the encapsulation length
-                continue_skipping = stream->read_ulong (length);
-                if (!continue_skipping)
-                  break;
-                // skip the encapsulation
-                continue_skipping = stream->skip_bytes (length);
-              }
-            } // end of switch
-        }
-      else // bad kind_ value to be decoded
-        {
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("TAO_Marshal_TypeCode::skip: ")
-                        ACE_TEXT ("Bad kind_ value in CDR stream\n")));
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
-                            TAO::TRAVERSE_STOP);
-        }
-    }
-
-  if (continue_skipping == 1)
-    return TAO::TRAVERSE_CONTINUE;
-  else
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((
-            LM_DEBUG,
-            ACE_TEXT ("TAO_Marshal_TypeCode::skip detected error\n")
-          ));
-      ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                        CORBA::COMPLETED_MAYBE),
-                        TAO::TRAVERSE_STOP);
-    }
-}
-
-TAO::traverse_status
-TAO_Marshal_Principal::skip (CORBA::TypeCode_ptr,
-                             TAO_InputCDR *stream
-                             ACE_ENV_ARG_DECL)
-{
-  CORBA::Boolean continue_skipping = 1;
-
-  // specifies the number of bytes in the Principal
-  CORBA::ULong len;
-
-  continue_skipping = stream->read_ulong (len);
-  if (len > 0 && continue_skipping)
-    {
-      continue_skipping = stream->skip_bytes (len);
-    }
-
-  if (continue_skipping == 1)
-    return TAO::TRAVERSE_CONTINUE;
-  else
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((
-            LM_DEBUG,
-            ACE_TEXT ("TAO_Marshal_Principal::skip detected error\n")
-          ));
-      ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                        CORBA::COMPLETED_MAYBE),
-                        TAO::TRAVERSE_STOP);
-    }
-}
-
-TAO::traverse_status
-TAO_Marshal_ObjRef::skip (CORBA::TypeCode_ptr,
-                          TAO_InputCDR *stream
-                          ACE_ENV_ARG_DECL)
-{
-  CORBA::Boolean continue_skipping = 1;
-
-  // return status
-  TAO::traverse_status retval =
-    TAO::TRAVERSE_CONTINUE;
-
-  // First, skip the type hint. This will be the type_id encoded in an
-  // object reference.
-  stream->skip_string ();
-
-  // Read the profiles, discarding all until an IIOP profile comes by.
-  // Once we see an IIOP profile, ignore any further ones.
-  //
-  // XXX this will need to change someday to let different protocol
-  // code be accessed, not just IIOP.  Protocol modules will be
-  // dynamically loaded from shared libraries via ORB_init (), and we
-  // just need to be able to access such preloaded libraries here as
-  // we unmarshal objrefs.
-  CORBA::ULong profiles = 0;
-
-  // get the count of profiles that follow
-  continue_skipping = stream->read_ulong (profiles);
-
-  while (profiles-- != 0 && continue_skipping)
-      {
-        CORBA::ULong tag;
-
-        // get the profile ID tag
-        if ( (continue_skipping = stream->read_ulong (tag)) == 0)
-          continue;
-
-        CORBA::ULong encap_len;
-        // ProfileData is encoded as a sequence of octet. So first get
-        // the length of the sequence.
-        // Create the decoding stream from the encapsulation in the
-        // buffer, and skip the encapsulation.
-        if ( (continue_skipping = stream->read_ulong (encap_len)) == 0)
-          continue;
-
-        continue_skipping = stream->skip_bytes (encap_len);
-      }
-
-  if (retval == TAO::TRAVERSE_CONTINUE
-      && continue_skipping == 1)
-    return TAO::TRAVERSE_CONTINUE;
-  else
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((
-            LM_DEBUG,
-            ACE_TEXT ("TAO_Marshal_ObjRef::skip detected error\n")
-          ));
-      ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                        CORBA::COMPLETED_MAYBE),
-                        TAO::TRAVERSE_STOP);
-    }
-}
-
-TAO::traverse_status
-TAO_Marshal_Struct::skip (CORBA::TypeCode_ptr  tc,
-                          TAO_InputCDR *stream
-                          ACE_ENV_ARG_DECL)
-{
-  TAO::traverse_status retval = TAO::TRAVERSE_CONTINUE;
-  CORBA::TypeCode_var param;
-
-  // Number of fields in the struct.
-  const CORBA::ULong member_count =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  for (CORBA::ULong i = 0;
-       i < member_count && retval == TAO::TRAVERSE_CONTINUE;
-       ++i)
-    {
-      param = tc->member_type (i ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-      retval = TAO_Marshal_Object::perform_skip (param.in (),
-                                                 stream
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-    }
-
-  if (retval == TAO::TRAVERSE_CONTINUE)
-    return TAO::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO_Marshal_Struct::skip detected error\n")));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
-}
-
-TAO::traverse_status
-TAO_Marshal_Union::skip (CORBA::TypeCode_ptr  tc,
-                         TAO_InputCDR *src
-                         ACE_ENV_ARG_DECL)
-{
-  CORBA::TypeCode_var discrim_tc =
-    tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  CORBA::ULong kind =
-    discrim_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  // Save the discriminator value in a temporary variable...
-  CORBA::Short short_v;
-  CORBA::UShort ushort_v;
-  CORBA::Long long_v;
-  CORBA::ULong ulong_v;
-  CORBA::ULong enum_v;
-  CORBA::Char char_v;
-  CORBA::WChar wchar_v;
-  CORBA::Boolean boolean_v = false;;
-
-  switch (kind)
-    {
-    case CORBA::tk_short:
-      {
-        if (!src->read_short (short_v))
-          return TAO::TRAVERSE_STOP;
-      }
-      break;
-
-    case CORBA::tk_ushort:
-      {
-        if (!src->read_ushort (ushort_v))
-          return TAO::TRAVERSE_STOP;
-      }
-      break;
-
-    case CORBA::tk_long:
-      {
-        if (!src->read_long (long_v))
-          return TAO::TRAVERSE_STOP;
-      }
-      break;
-
-    case CORBA::tk_ulong:
-      {
-        if (!src->read_ulong (ulong_v))
-          return TAO::TRAVERSE_STOP;
-      }
-      break;
-
-    case CORBA::tk_enum:
-      {
-        if (!src->read_ulong (enum_v))
-          return TAO::TRAVERSE_STOP;
-      }
-      break;
-
-    case CORBA::tk_char:
-      {
-        if (!src->read_char (char_v))
-          return TAO::TRAVERSE_STOP;
-      }
-      break;
-
-    case CORBA::tk_wchar:
-      {
-        if (!src->read_wchar (wchar_v))
-          return TAO::TRAVERSE_STOP;
-      }
-      break;
-
-    case CORBA::tk_boolean:
-      {
-        if (!src->read_boolean (boolean_v))
-          return TAO::TRAVERSE_STOP;
-      }
-      break;
-
-    default:
-      return TAO::TRAVERSE_STOP;
-    }
-
-  const CORBA::ULong member_count =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  const CORBA::ULong null_member = ~static_cast<CORBA::ULong> (0U);
-
-  CORBA::ULong current_member = null_member;
-  CORBA::ULong default_member = null_member;
-
-  for (CORBA::ULong i = 0;
-       i < member_count && current_member == null_member;
-       ++i)
-    {
-      CORBA::Any_var any = tc->member_label (i ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-      CORBA::Octet o;
-      if ((any >>= CORBA::Any::to_octet (o)) && o == 0)
-        {
-          CORBA::ULong default_index =
-            tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-          if (i != default_index)
-            ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
-                              TAO::TRAVERSE_STOP);
-          // Found the default branch, save its position and continue
-          // trying to find the current value...
-          default_member = i;
-          continue;
-        }
-
-      switch (kind)
-        {
-        case CORBA::tk_short:
-          {
-            CORBA::Short d;
-            if ((any >>= d) && d == short_v)
-              current_member = i;
-          }
-          break;
-
-        case CORBA::tk_ushort:
-          {
-            CORBA::UShort d;
-            if ((any >>= d) && d == ushort_v)
-              current_member = i;
-          }
-          break;
-
-        case CORBA::tk_long:
-          {
-            CORBA::Long d;
-            if ((any >>= d) && d == long_v)
-              current_member = i;
-          }
-          break;
-
-        case CORBA::tk_ulong:
-          {
-            CORBA::ULong d;
-            if ((any >>= d) && d == ulong_v)
-              current_member = i;
-          }
-          break;
-
-        case CORBA::tk_enum:
-          {
-            CORBA::ULong d;
-            TAO::Any_Impl *impl = any->impl ();
-
-            if (impl->encoded ())
-              {
-                TAO::Unknown_IDL_Type *unk =
-                  dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-
-                // We don't want unk's rd_ptr to move, in case
-                // we are shared by another Any, so we use this
-                // to copy the state, not the buffer.
-                TAO_InputCDR for_reading (unk->_tao_get_cdr ());
-
-                for_reading.read_ulong (d);
-              }
-            else
-              {
-                TAO_OutputCDR out;
-                impl->marshal_value (out);
-                TAO_InputCDR cdr (out);
-                cdr.read_ulong (d);
-              }
-
-            if (d == enum_v)
-              {
-                current_member = i;
-              }
-          }
-          break;
-
-        case CORBA::tk_char:
-          {
-            CORBA::Char d;
-            if ((any >>= CORBA::Any::to_char (d)) && d == char_v)
-              current_member = i;
-          }
-          break;
-
-        case CORBA::tk_wchar:
-          {
-            CORBA::WChar d;
-            if ((any >>= CORBA::Any::to_wchar (d)) && d == wchar_v)
-              current_member = i;
-          }
-          break;
-
-        case CORBA::tk_boolean:
-          {
-            CORBA::Boolean d;
-            if ((any >>= CORBA::Any::to_boolean (d)) && d == boolean_v)
-              current_member = i;
-          }
-          break;
-
-        default:
-          return TAO::TRAVERSE_STOP;
-        }
-    }
-
-  if (current_member == null_member)
-    {
-      // Cannot find the current member, check if there is a
-      // default...
-      if (default_member != null_member)
-        {
-          // Good, use the default to append...
-          CORBA::TypeCode_var member_tc =
-            tc->member_type (default_member ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-          return TAO_Marshal_Object::perform_skip (member_tc.in (),
-                                                   src
-                                                   ACE_ENV_ARG_PARAMETER);
-        }
-
-      // If we're here, we have an implicit default case, and we
-      // should just return without skipping anything, since no
-      // union member was marshaled in the first place.
-      return TAO::TRAVERSE_CONTINUE;
-    }
-
-  // If we found the member successfully then just use that one...
-  CORBA::TypeCode_var member_tc =
-    tc->member_type (current_member ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  return TAO_Marshal_Object::perform_skip (member_tc.in (),
-                                           src
-                                           ACE_ENV_ARG_PARAMETER);
-}
-
-TAO::traverse_status
-TAO_Marshal_String::skip (CORBA::TypeCode_ptr,
-                          TAO_InputCDR *stream
-                          ACE_ENV_ARG_DECL)
-{
-  CORBA::Boolean continue_skipping = 1;
-
-  // On decode, omit the check against specified string bounds, and
-  // cope with illegal "zero length" strings (all lengths on the wire
-  // must include a NUL).
-  //
-  // This is on the principle of being gracious in what we accept; we
-  // don't generate messages that fail to comply with protocol specs,
-  // but we will accept them when it's clear how to do so.
-
-  continue_skipping = stream->skip_string ();
-  if (continue_skipping == 1)
-    return TAO::TRAVERSE_CONTINUE;
-  else
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO_Marshal_String::skip detected error\n")));
-      ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                        CORBA::COMPLETED_MAYBE),
-                        TAO::TRAVERSE_STOP);
-    }
-}
-
-TAO::traverse_status
-TAO_Marshal_Sequence::skip (CORBA::TypeCode_ptr  tc,
-                            TAO_InputCDR *stream
-                            ACE_ENV_ARG_DECL)
-{
-  // Size of element.
-  CORBA::ULong bounds;
-
-  // First unmarshal the sequence length ... we trust it to be right
-  // here, on the "be gracious in what you accept" principle.  We
-  // don't generate illegal sequences (i.e. length > bounds).
-
-  CORBA::Boolean continue_skipping =
-    stream->read_ulong (bounds);
-
-  if (!continue_skipping)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO_Marshal_Sequence::skip detected error\n")));
-      ACE_THROW_RETURN (CORBA::MARSHAL (),
-                        TAO::TRAVERSE_STOP);
-    }
-
-  // No point decoding an empty sequence.
-  if (bounds == 0)
-    return TAO::TRAVERSE_CONTINUE;
-
-  // Get element typecode.
-  CORBA::TypeCode_var tc2 =
-    tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  // For CORBA basic types, the skip can be optimized
-  CORBA::TCKind kind = tc2->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  char *dummy;
-  switch (kind)
-    {
-    case CORBA::tk_octet:
-    case CORBA::tk_boolean:
-    case CORBA::tk_char:
-      {
-        stream->adjust (0, ACE_CDR::OCTET_ALIGN, dummy);
-        continue_skipping =
-          stream->skip_bytes (ACE_CDR::OCTET_SIZE * bounds);
-      }
-      break;
-    case CORBA::tk_short:
-    case CORBA::tk_ushort:
-    case CORBA::tk_wchar:
-      {
-        stream->adjust (0, ACE_CDR::SHORT_ALIGN, dummy);
-        continue_skipping =
-          stream->skip_bytes (ACE_CDR::SHORT_SIZE * bounds);
-      }
-      break;
-    case CORBA::tk_long:
-    case CORBA::tk_ulong:
-    case CORBA::tk_float:
-      {
-        stream->adjust (0, ACE_CDR::LONG_ALIGN, dummy);
-        continue_skipping =
-          stream->skip_bytes (ACE_CDR::LONG_SIZE * bounds);
-      }
-      break;
-    case CORBA::tk_double:
-    case CORBA::tk_longlong:
-    case CORBA::tk_ulonglong:
-      {
-        stream->adjust (0, ACE_CDR::LONGLONG_ALIGN, dummy);
-        continue_skipping =
-          stream->skip_bytes (ACE_CDR::LONGLONG_SIZE * bounds);
-      }
-      break;
-    case CORBA::tk_longdouble:
-      {
-        stream->adjust (0, ACE_CDR::LONGDOUBLE_ALIGN, dummy);
-        continue_skipping =
-          stream->skip_bytes (ACE_CDR::LONGDOUBLE_SIZE * bounds);
-      }
-      break;
-
-    default:
-      while (bounds-- && continue_skipping == 1)
-        {
-          continue_skipping =
-            TAO_Marshal_Object::perform_skip (tc2.in (),
-                                              stream
-                                              ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-        }
-      break;
-    }// end of switch
-
-  if (continue_skipping)
-    return TAO::TRAVERSE_CONTINUE;
-
-  // error exit
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO_Marshal_Sequence::skip detected error\n")));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (),
-                    TAO::TRAVERSE_STOP);
-}
-
-TAO::traverse_status
-TAO_Marshal_Array::skip (CORBA::TypeCode_ptr  tc,
-                         TAO_InputCDR *stream
-                         ACE_ENV_ARG_DECL)
-{
-  CORBA::Boolean continue_skipping = 1;
-
-
-  // retrieve the bounds of the array
-  CORBA::ULong bounds = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  // get element typecode
-  // Typecode of the element.
-  CORBA::TypeCode_var tc2 = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  // For CORBA basic types, the skip can be optimized
-  CORBA::TCKind kind = tc2->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  char *dummy;
-  switch (kind)
-    {
-    case CORBA::tk_octet:
-    case CORBA::tk_boolean:
-    case CORBA::tk_char:
-      {
-        stream->adjust (0, ACE_CDR::OCTET_ALIGN, dummy);
-        continue_skipping =
-          stream->skip_bytes (ACE_CDR::OCTET_SIZE * bounds);
-      }
-      break;
-    case CORBA::tk_short:
-    case CORBA::tk_ushort:
-    case CORBA::tk_wchar:
-      {
-        stream->adjust (0, ACE_CDR::SHORT_ALIGN, dummy);
-        continue_skipping =
-          stream->skip_bytes (ACE_CDR::SHORT_SIZE * bounds);
-      }
-      break;
-    case CORBA::tk_long:
-    case CORBA::tk_ulong:
-    case CORBA::tk_float:
-      {
-        stream->adjust (0, ACE_CDR::LONG_ALIGN, dummy);
-        continue_skipping =
-          stream->skip_bytes (ACE_CDR::LONG_SIZE * bounds);
-      }
-      break;
-    case CORBA::tk_double:
-    case CORBA::tk_longlong:
-    case CORBA::tk_ulonglong:
-      {
-        stream->adjust (0, ACE_CDR::LONGLONG_ALIGN, dummy);
-        continue_skipping =
-          stream->skip_bytes (ACE_CDR::LONGLONG_SIZE * bounds);
-      }
-      break;
-    case CORBA::tk_longdouble:
-      {
-        stream->adjust (0, ACE_CDR::LONGDOUBLE_ALIGN, dummy);
-        continue_skipping =
-          stream->skip_bytes (ACE_CDR::LONGDOUBLE_SIZE * bounds);
-      }
-      break;
-
-    default:
-      while (bounds-- && continue_skipping == 1)
-        {
-          int stop =
-            TAO_Marshal_Object::perform_skip (tc2.in (),
-                                              stream
-                                              ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-          if (stop == TAO::TRAVERSE_STOP)
-            continue_skipping = 0;
-        }
-      break;
-    }// end of switch
-
-  if (continue_skipping)
-    return TAO::TRAVERSE_CONTINUE;
-
-  // error exit
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO_Marshal_Sequence::skip detected error\n")));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (),
-                    TAO::TRAVERSE_STOP);
-}
-
-TAO::traverse_status
-TAO_Marshal_Alias::skip (CORBA::TypeCode_ptr  tc,
-                         TAO_InputCDR *stream
-                         ACE_ENV_ARG_DECL)
-{
-  // Typecode of the aliased type.
-  CORBA::TypeCode_var tc2;
-  CORBA::Boolean continue_skipping = 1;
-
-  // Status of decode operation.
-  TAO::traverse_status retval =
-    TAO::TRAVERSE_CONTINUE;
-
-  tc2 = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  retval = TAO_Marshal_Object::perform_skip (tc2.in (),
-                                             stream
-                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  //  tc2->_decr_refcnt ();
-  if (retval == TAO::TRAVERSE_CONTINUE
-      && continue_skipping == 1)
-    return TAO::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO_Marshal_Alias::skip detected error\n")));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
-}
-
-// Decode exception For exceptions, the "hidden" type ID near the
-// front of the on-wire representation was previously unmarshaled and
-// mapped to the "tc" typcode we're using to traverse the memory ...
-// at the same time its vtable, refcount, and other state was
-// established.
-//
-// NOTE: This is asymmetric with respect to encoding exceptions.
-TAO::traverse_status
-TAO_Marshal_Except::skip (CORBA::TypeCode_ptr  tc,
-                          TAO_InputCDR *stream
-                          ACE_ENV_ARG_DECL)
-{
-  TAO::traverse_status retval =
-    TAO::TRAVERSE_CONTINUE;
-  CORBA::TypeCode_var param;
-
-  // skip the Repository ID
-  if (!stream->skip_string ())
-    return TAO::TRAVERSE_STOP;
-
-  // Number of fields in the exception
-  const CORBA::ULong member_count =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  for (CORBA::ULong i = 0;
-       i < member_count && retval == TAO::TRAVERSE_CONTINUE;
-       ++i)
-    {
-      param = tc->member_type (i ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-      retval = TAO_Marshal_Object::perform_skip (param.in (),
-                                                 stream
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-    }
-
-  if (retval == TAO::TRAVERSE_CONTINUE)
-    return TAO::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO_Marshal_Except::skip detected error\n")));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
-}
-
-// decode wstring
-TAO::traverse_status
-TAO_Marshal_WString::skip (CORBA::TypeCode_ptr,
-                           TAO_InputCDR *stream
-                           ACE_ENV_ARG_DECL)
-{
-  ACE_CDR::Boolean continue_skipping = 1;
-
-  // On decode, omit the check against specified wstring bounds, and
-  // cope with illegal "zero length" strings (all lengths on the wire
-  // must include a NUL).
-  //
-  // This is on the principle of being gracious in what we accept; we
-  // don't generate messages that fail to comply with protocol specs,
-  // but we will accept them when it's clear how to do so.
-
-  // "zero length" wstrings are legal in GIOP 1.2.
-
-  continue_skipping = stream->skip_wstring ();
-
-  if (continue_skipping == 1)
-    return TAO::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO_Marshal_WString::skip detected error\n")));
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
-}
-
-TAO::traverse_status
-TAO_Marshal_Value::skip (CORBA::TypeCode_ptr  tc,
-                         TAO_InputCDR *stream
-                         ACE_ENV_ARG_DECL)
-{
-  TAO::traverse_status retval = TAO::TRAVERSE_CONTINUE;
-  CORBA::TypeCode_var param;
-
-  // Use the same method to skip over our base valuetype.
-  // To achive this we'll need to distinguish between
-  // first-time/nested skips so that we won't attempt to
-  // skip rep_id several times.
-  //
-  if (this->nested_processing_ == 0)
-    {
-      this->nested_processing_ = 1;
-
-      CORBA::ULong value_tag;
-
-      if (!stream->read_ulong (value_tag))
-        {
-          return TAO::TRAVERSE_STOP;
-        }
-
-      TAO_Valuetype_Adapter *adapter =
-        ACE_Dynamic_Service<TAO_Valuetype_Adapter>::instance (
-            TAO_ORB_Core::valuetype_adapter_name ()
-          );
-
-      if (adapter == 0)
-        {
-          ACE_THROW_RETURN (CORBA::INTERNAL (),
-                            TAO::TRAVERSE_STOP);
-        }
-
-      if (value_tag == 0) // Null value type pointer.
-        {
-          //We are done.
-          return retval;
-        }
-      else if (value_tag & adapter->type_info_single ())
-        {
-          // Skip a single repository id which is of type string.
-          stream->skip_string ();
-        }
-      else
-        {
-          //@@ boris: VT CDR
-          return TAO::TRAVERSE_STOP;
-        }
-    }
-
-  // Handle our base valuetype if any.
-  param = tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  CORBA::TCKind const k = param->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  if (k != CORBA::tk_null)
-    {
-      retval = this->skip (param.in (), stream ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-      if (retval != TAO::TRAVERSE_CONTINUE)
-        {
-          return retval;
-        }
-    }
-
-  // Number of fields in the valuetype.
-  const CORBA::ULong member_count =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  for (CORBA::ULong i = 0;
-       i < member_count && retval == TAO::TRAVERSE_CONTINUE;
-       ++i)
-    {
-      param = tc->member_type (i ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-      retval = TAO_Marshal_Object::perform_skip (param.in (),
-                                                 stream
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-    }
-
-  if (retval == TAO::TRAVERSE_CONTINUE)
-    return TAO::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO_Marshal_Value::skip detected error\n")));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
-}
diff --git a/TAO/tao/tao.mpc b/TAO/tao/tao.mpc
index 0dfdc94faa8..937f4be87fe 100644
--- a/TAO/tao/tao.mpc
+++ b/TAO/tao/tao.mpc
@@ -13,15 +13,7 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     Adapter.cpp
     Adapter_Factory.cpp
     Adapter_Registry.cpp
-    Alias_TypeCode_Static.cpp
-    Any.cpp
-    Any_Basic_Impl.cpp
-    Any_Impl.cpp
-    Any_SystemException.cpp
-    Any_Unknown_IDL_Type.cpp
-    AnySeqA.cpp
-    AnySeqC.cpp
-    append.cpp
+    AnyTypeCode_Adapter.cpp
     Argument.cpp
     Asynch_Queued_Message.cpp
     Asynch_Reply_Dispatcher_Base.cpp
@@ -30,13 +22,9 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     Bind_Dispatcher_Guard.cpp
     Block_Flushing_Strategy.cpp
     Blocked_Connect_Strategy.cpp
-    BooleanSeqA.cpp
     BooleanSeqC.cpp
-    BoundsA.cpp
-    BoundsC.cpp
     Cache_Entries.cpp
     CDR.cpp
-    CharSeqA.cpp
     CharSeqC.cpp
     Cleanup_Func_Registry.cpp
     Client_Strategy_Factory.cpp
@@ -51,12 +39,10 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     Connection_Handler.cpp
     Connection_Purging_Strategy.cpp
     Connector_Registry.cpp
-    CONV_FRAMEA.cpp
     CONV_FRAMEC.cpp
     CORBA_String.cpp
     CORBALOC_Parser.cpp
     CORBANAME_Parser.cpp
-    CurrentA.cpp
     CurrentC.cpp
     debug.cpp
     default_client.cpp
@@ -68,25 +54,16 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     Default_Stub_Factory.cpp
     Default_Thread_Lane_Resources_Manager.cpp
     DLL_Parser.cpp
-    DomainA.cpp
     DomainC.cpp
-    DoubleSeqA.cpp
     DoubleSeqC.cpp
     Dynamic_Adapter.cpp
-    Dynamic_ParameterA.cpp
-    Dynamic_ParameterC.cpp
-    DynamicA.cpp
-    DynamicC.cpp
-    Empty_Param_TypeCode.cpp
     Endpoint.cpp
     Endpoint_Selector_Factory.cpp
-    Enum_TypeCode_Static.cpp
     Environment.cpp
     Exception.cpp
     Exclusive_TMS.cpp
     Fault_Tolerance_Service.cpp
     FILE_Parser.cpp
-    FloatSeqA.cpp
     FloatSeqC.cpp
     Flushing_Strategy.cpp
     GIOP_Message_Base.cpp
@@ -100,28 +77,22 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     GIOP_Message_State.cpp
     GIOP_Message_Version.cpp
     GIOP_Utils.cpp
-    GIOPA.cpp
     GIOPC.cpp
     IFR_Client_Adapter.cpp
     IIOP_Acceptor.cpp
     IIOP_Connection_Handler.cpp
     IIOP_Connector.cpp
     IIOP_Endpoint.cpp
-    IIOP_EndpointsA.cpp
     IIOP_EndpointsC.cpp
     IIOP_Factory.cpp
     IIOP_Lite_Factory.cpp
     IIOP_Profile.cpp
     IIOP_Transport.cpp
-    IIOPA.cpp
     IIOPC.cpp
     Incoming_Message_Queue.cpp
-    InvalidSlotA.cpp
-    InvalidSlotC.cpp
     Invocation_Adapter.cpp
     Invocation_Base.cpp
     Invocation_Endpoint_Selectors.cpp
-    IOP_IORA.cpp
     IOP_IORC.cpp
     IOPC.cpp
     IOR_Parser.cpp
@@ -143,32 +114,25 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     LocalObject.cpp
     LocateRequest_Invocation.cpp
     LocateRequest_Invocation_Adapter.cpp
-    LongDoubleSeqA.cpp
     LongDoubleSeqC.cpp
-    LongLongSeqA.cpp
     LongLongSeqC.cpp
-    LongSeqA.cpp
     LongSeqC.cpp
     LRU_Connection_Purging_Strategy.cpp
     Managed_Types.cpp
-    Marshal.cpp
     MCAST_Parser.cpp
-    Messaging_PolicyValueA.cpp
     Messaging_PolicyValueC.cpp
     Messaging_SyncScopeC.cpp
     MProfile.cpp
     Muxed_TMS.cpp
     New_Leader_Generator.cpp
+    NVList_Adapter.cpp
     Object.cpp
     Object_KeyC.cpp
     Object_Loader.cpp
     Object_Proxy_Broker.cpp
     Object_Ref_Table.cpp
-    ObjectIdListA.cpp
     ObjectIdListC.cpp
     ObjectKey_Table.cpp
-    Objref_TypeCode_Static.cpp
-    OctetSeqA.cpp
     OctetSeqC.cpp
     operation_details.cpp
     ORB.cpp
@@ -179,27 +143,18 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     ORB_Core_Auto_Ptr.cpp
     ORB_Core_TSS_Resources.cpp
     ORB_Table.cpp
-    ParameterModeA.cpp
     ParameterModeC.cpp
     params.cpp
     Parser_Registry.cpp
     PI_ForwardC.cpp
-    PICurrent.cpp
-    PICurrentA.cpp
-    PICurrentC.cpp
-    PICurrent_Copy_Callback.cpp
-    PICurrent_Impl.cpp
-    PICurrent_Loader.cpp
     Pluggable_Messaging.cpp
     Pluggable_Messaging_Utils.cpp
     Policy_Current.cpp
     Policy_Current_Impl.cpp
-    Policy_ForwardA.cpp
     Policy_ForwardC.cpp
     Policy_Manager.cpp
     Policy_Set.cpp
     Policy_Validator.cpp
-    PolicyA.cpp
     PolicyC.cpp
     PolicyFactory_Registry_Adapter.cpp
     PolicyFactory_Registry_Factory.cpp
@@ -217,23 +172,16 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     Remote_Object_Proxy_Broker.cpp
     Reply_Dispatcher.cpp
     Request_Dispatcher.cpp
-    RequestInfo_Util.cpp
     Resource_Factory.cpp
     Resume_Handle.cpp
     Sequence.cpp
-    Sequence_TypeCode_Static.cpp
     Server_Strategy_Factory.cpp
     ServerRequestInterceptor_Adapter_Factory.cpp
     Service_Callbacks.cpp
     Service_Context.cpp
     Services_Activate.cpp
-    ShortSeqA.cpp
     ShortSeqC.cpp
-    skip.cpp
-    String_TypeCode_Static.cpp
-    StringSeqA.cpp
     StringSeqC.cpp
-    Struct_TypeCode_Static.cpp
     Stub.cpp
     Stub_Factory.cpp
     Sync_Strategies.cpp
@@ -241,19 +189,16 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     Synch_Queued_Message.cpp
     Synch_Reply_Dispatcher.cpp
     SystemException.cpp
-    SystemExceptionA.cpp
     Tagged_Components.cpp
     Tagged_Profile.cpp
     TAO_Internal.cpp
     TAO_Server_Request.cpp
     TAO_Singleton_Manager.cpp
-    TAOA.cpp
     TAOC.cpp
     target_specification.cpp
     Thread_Lane_Resources.cpp
     Thread_Lane_Resources_Manager.cpp
     Thread_Per_Connection_Handler.cpp
-    TimeBaseA.cpp
     TimeBaseC.cpp
     Transport.cpp
     Transport_Acceptor.cpp
@@ -262,36 +207,21 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     Transport_Descriptor_Interface.cpp
     Transport_Mux_Strategy.cpp
     Transport_Timer.cpp
-    True_RefCount_Policy.cpp
     TSS_Resources.cpp
-    TypeCode.cpp
-    TypeCodeA.cpp
-    Typecode_typesC.cpp
-    TypeCode_CDR_Extraction.cpp
-    TypeCode_Constants.cpp
     TypeCodeFactory_Adapter.cpp
-    ULongLongSeqA.cpp
+    Typecode_typesC.cpp
     ULongLongSeqC.cpp
-    ULongSeqA.cpp
     ULongSeqC.cpp
-    Union_TypeCode_Static.cpp
     UserException.cpp
-    UShortSeqA.cpp
     UShortSeqC.cpp
-    Value_TypeCode_Static.cpp
     Valuetype_Adapter.cpp
-    ValueModifierC.cpp
-    VisibilityC.cpp
     Wait_On_Leader_Follower.cpp
     Wait_On_LF_No_Upcall.cpp
     Wait_On_Reactor.cpp
     Wait_On_Read.cpp
     Wait_Strategy.cpp
-    WCharSeqA.cpp
     WCharSeqC.cpp
-    WrongTransactionA.cpp
     WrongTransactionC.cpp
-    WStringSeqA.cpp
     WStringSeqC.cpp
     GUIResource_Factory.cpp
   }
@@ -337,7 +267,6 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     Block_Flushing_Strategy.h
     BooleanSeqC.h
     BooleanSeqS.h
-    BoundsC.h
     Buffer_Allocator_T.h
     Buffering_Constraint_Policy.h
     Cache_Entries.h
@@ -434,8 +363,6 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     IIOP_Profile.h
     IIOP_Transport.h
     Incoming_Message_Queue.h
-    InvalidSlotC.h
-    InvalidSlotS.h
     Invocation_Adapter.h
     Invocation_Base.h
     Invocation_Endpoint_Selectors.h
@@ -478,7 +405,6 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     Muxed_TMS.h
     New_Leader_Generator.h
     Null_RefCount_Policy.h
-    NVList.h
     Object_Argument_T.h
     Object.h
     objectid.h
@@ -510,12 +436,6 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     ParameterModeS.h
     params.h
     Parser_Registry.h
-    PICurrent_Copy_Callback.h
-    PICurrent.h
-    PICurrentC.h
-    PICurrentS.h
-    PICurrent_Impl.h
-    PICurrent_Loader.h
     PI_ForwardC.h
     Pluggable_Messaging.h
     Pluggable_Messaging_Utils.h
@@ -548,7 +468,6 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     Remote_Object_Proxy_Broker.h
     Reply_Dispatcher.h
     Request_Dispatcher.h
-    RequestInfo_Util.h
     Resource_Factory.h
     Resume_Handle.h
     Seq_Out_T.h
@@ -637,10 +556,6 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     VarOut_T.h
     Var_Size_Argument_T.h
     Version.h
-    VisibilityC.h
-    VisibilityS.h
-    ValueModifierC.h
-    ValueModifierS.h
     Wait_On_Leader_Follower.h
     Wait_On_LF_No_Upcall.h
     Wait_On_Reactor.h